Make test failures easier to diagnose
Revert commit 824. Many tests depend on bean properties through hamcrest matchers.