Added all of the testing