More code coverage. And fixes.