lots of test fixes, etc.