a few changes and simplifications for the tests