Submitting before refactoring the functional tests.