Change range of testing for ControllerParameters and fix leaks