More work supporting new content types

Cleaned up test block for sending test values