Moved misc methods to the test helper class