More coverage in test_different_raws(). Main code changed so it passes.