more fields and tests