Fixed the broken unittests

Conflicts:
	src/main/scala/grapevineType/GrapevineType.scala