post-test fixes