post test fixes