Commenting out items that we don't need to test for. I thought I did this a while ago. I wish I knew where it went...