Corrected some tests 2
Merge branch 'master' of https://github.com/darzul/bid

Conflicts:
	tests/bid/BidTest.java