Worked on tests for Employee and made a few changes to Consumer test and Customer.
Merge remote-tracking branch 'origin/RobAndBen' into RobAndBen