Reduce visibility on some more methods now the tests have been moved around.