More fixes for comeAtMe/added unit test for comeAtMe