refactoring KikuyuController and its tests