Re-arrange redundant tests for Document::fields