re-added some tests that I think were clobbered in a previous merge