test fixes again