test fixes and additions