Finished adding new tests