Mark a few more lines with 'no cover' - missed them the first time through. The rest should have test cases added.