more rigorous search of raw_vals that should be resistant to null chars and random line breaks
Merge pull request #1270 from ifreecarve/2013-07-29_smoke_fix

More rigorous handling of raw_vals in SMOKE test