CatroidTest refactored