More parameter checking fixes with tests.