deleted scalajdo stuff from util package
modified test data