It is hard to test these classes. Replace class methods with instance methods. Consider merging these 2 classes into one class.