more updated in order to have unit tests running on emulator