More changes; more tests for fields presence/functionality