Finished adding tests