updated tests and Controller