Fix code completeness checks.

Once again I failed to run tests on refactored code. Oh, well.