some improvements to help with finding the bug in the test suite