Test fix 

Unfortunately, I can't double check these fixes, since I'm outside the FHCRC's IP range.