Completed writing all the tests