remade the tests