more fields updates and tests