Modified tests so everything passes now