fix @pbauer's test failures