more test fixes and updates