fix a number of test errors with eclipselink