Completed unit testing