tweak tests for 5.8