Round out input fields and make tests pass