rewrote the tests