Fixing code so header and body product bytes and tests are cleaned up.