Refactored names, added missing tests

NOTE: Field is probably not the best name for a field.