Commit before refactoring.
Refactored functional tests.