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.