test fixes
4 files changed