initial test fixes