[#2] More massaging of the test suite