Simplified reuse of features by the hibernate module, solved a minor bug in the tests. The problem with the payment method mapping persists.