Clean up functional-tests module