removed tests and changed controller