test fixes, more tests