Cleaned up the code in the functional tests