Yepp, agreed. There is already [OGM-398](https://hibernate.atlassian.net/browse/OGM-398) to remove test-only code from production classes. That's one of the next things I plan to address.