[Kitaka] Made simple refactorings to get the tests working.