Worked on some tests, mainly for OrderManager.
Merge remote-tracking branch 'origin/RobAndBen' into RobAndBen

Conflicts:
	tests/com/sky/bootcamp/accessoriesstore/tests/ConsumerTest.java
Rolled back tests to pre-bean versions.