PDB-473 Additional tests for verify-content-type and other cleanups

Signed-off-by: Ken Barber <ken@bob.sh>