Finished unit testing for iteration 2