test fixes
all tests pass