Completed unit tests 7/23/14