cleaned up functional tests