added more fields, and tests for those fields