Form field rework and tests