Moved test for fields to models for real