more tests
Bit more work on short field names