Refactoring tests to allow for private methods to be tested vicariously