Fixed failing emulator tests.