Update the functional tests & wire up the form