fixed a test because it was testing something wrong
Merge with Zane
Conflicts:
	src/Tests.scala