More hibernate configs.  Improved tests