Completed unit tests pt2