ticket:8 test fixes