Finished with the first iteration of test coverage