[CLEANUP] Clean up functional tests