a couple of fixes for the tests