Update tests to work with later Fog mocks, and fix instance name test.