Organize drive tests and remove outdated test