simplify controllers
cleanup tests
fix tests and associations