Finished unit testing for iteration 1