Homogenise fields tests.
(cherry picked from commit 6e6c0df)
Homogenise fields test fix.
(cherry picked from commit f848451)
Merge pull request #30 from faph/homogenise_fields_tests

Homogenise fields tests
Merge remote-tracking branch 'upstream/master' into comments