preliminary test fixes