Adding controllers and integration tests