...crap. it looks like some of the tests pollute one-another. unclear whether it has anything to do with this branch.