Raw classification now correct and tested