these confounded tests drive me nuts
stuff
tl;dr
merged branch master