Test fix ups

Not sure this is the cleanest way, but it does fix the tests. I went ahead and removed -r since it I think it'd only confuse things.