reorganizing tests, fixing a granularity bug with the classification metric