Finished adding more tests