Remove unnecessary test fields
An approach that actually compiles (why is converting from java so hard?)