Added missing tests to controller