Checkstyle corrections, moved old tests

The old integration tests are now in their own ...entitymanager package. The
config for the tests still needs updating
The sessionfactory test passes.