regular test fixes