Refactoring to use persistence (JPA2). Disconnected the tests from the
metrics for the time being.