Hopefully fixed so all tests are ran