Slimming the test
Running out of tree returns None
Added classification, mostly