Add tests for fields