Moving all the test specific util classes to their own package