Split classes. More unit test mockups.