I made a few changes to the tests