Add test coverage for all cases

Also actually start measuring coverage.