Added test of fields too