Commiting before refactoring
refactor functional_test.py