Worked a bit on code coverage.