Fixed tests to controller