clean up the hibernate criteria test a bit