Refactored Field & added param testing