Get rid of test helper method