Change hibernate test config name
Merge branch 'step-7' into step-8
Change test resource names