Added FieldTests, few bugs fixed