more tests
test fixes