restructure extractor tests a bit
few more tests for grade variants