a few fixes to the tests