Be precise about what we intend to support
Cleanup of max line lengths in tests