Finish functional test refactor