Fixed minor timing issues to get all tests passing in both emulators on Shir's machine