#46: test fixes