@@ -20,6 +20,7 @@
 from git.stats import Stats
 from git.utils import dashify
 from git.utils import touch
+from git.remote import Remote
 
 
 __all__ = [ name for name, obj in locals().items()
 
@@ -151,7 +151,7 @@ def create(cls, repo, name, url, **kwargs):
 		Raise
 			GitCommandError in case an origin with that name already exists
 		"""
-		self.repo.git.remote( "add", name, url, **kwargs )
+		repo.git.remote( "add", name, url, **kwargs )
 		return cls(repo, name)
 
 	# add is an alias
@@ -164,6 +164,9 @@ def remove(cls, repo, name ):
 		"""
 		repo.git.remote("rm", name)
 
+	# alias
+	rm = remove
+		
 	def rename(self, new_name):
 		"""
 		Rename self to the given new_name
 
@@ -49,7 +49,7 @@ def test_base(self):
 				assert writer.get(opt) == val
 				del(writer)
 				assert getattr(remote, opt) == val
-			# END 
+			# END for each default option key 
 
 			# RENAME 
 			other_name = "totally_other_name"
@@ -69,6 +69,21 @@ def test_base(self):
 
 
 	def test_creation_and_removal(self):
-		self.fail( "Test remote creation/removal" )
+		new_name = "test_new_one"
+		arg_list = (new_name, "git@server:hello.git")
+		remote = Remote.create(self.repo, *arg_list )
+		assert remote.name == "test_new_one"
+		
+		# create same one again
+		self.failUnlessRaises(GitCommandError, Remote.create, self.repo, *arg_list)
+		
+		Remote.remove(self.repo, new_name)
+		
+		for remote in self.repo.remotes:
+			if remote.name == new_name:
+				raise AssertionError("Remote removal failed")
+			# END if deleted remote matches existing remote's name
+		# END for each remote
+