created two new tests to check collisions. Still failing
created two new tests to check collisions. Still failing

Conflicts:
	test/test_manager.py

Conflicts:
	test/test_manager.py

vguzmanp/cloud-in-one