fix @tdesvenain's test failures