Made the tests better