Provide the classes with Make methods to work better with testing