Test class, corrections in persistence / sql packages.