Make all the new methods private, and jigger unit tests to be able to test them.