t1000: use test_line_count where appropriate

This avoids test failures caused by "wc -l" on OS X adding extra
whitespace.

Reported-by: Matt McClure <matthewlmcclure@gmail.com>
Signed-off-by: John Keeping <john@keeping.me.uk>