[Argha] general cleanup of functional test files.