Corrected some tests that for some reason were clobbered to the best of my knowledge