More code coverage and internal fixes.