Added more controllers and tests.