added more tests and expressions to fields