Changed to FieldVal naming and added init test