Fixed some tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/spacetrader/UniverseTest.java