New tests and test fixes.