Fixed Controller tests
Fixed other tests