Moved some tests into the test helper class.