fixes in classify and test