Minor fixes + adding emulator init test