Implemented more Controller tests