test fixes: