More consistent test layout
Small code improvements
Issue 88: reflexivity for classes where fields are accidentally mixed up in equals