Completed unit tests
Changes made to complete exercise