Fixed Raw, changed test 2
Minor changes