Add separate classes to use instead once tests are completed.
Using the subclasses now that there are some tests for those methods.