Changes to functional tests to use inputs.