Moves classes out of FieldsAsArraysTest, keep it simple!