Updated tests + deleted some tests that were unnecessary