add tests, edit controllers