Completed a draft of all the tests