Added alex's test code and removed geo's
merge