multi-line docs; small test fixes