more test refactoring, better checkFields version