Move tests for Content-{Length,Type} headers to main test

Signed-off-by: Dave Goddard <dgoddard@pivotal.io>