Move two more fog tests to correct location

There is one remaining fog test to move, but moving it causes an error due to the ordering, so I'm going to move and fix that in a separate commit.
Add FIXME to test that clears ENV

I have punted this to a bug in Pivotal https://www.pivotaltracker.com/story/show/76118720.