Refactor more testcases to run on the Emulator rather than on the Device