a few changes over all tests