Fix existing tests.
Add tests
Generalize path check for fields.