setup controllers and tests, tweak schema