Fix up test coverage