preamble -> header_prelude
remove header prefixes
whitespace and additions
missed one
add explicit construtor for client that takes URI
mocks