Remove redundant classes from tests and make field labels clearer
Delete build directory