Finished implementing tests