Make the tests better