Ignore async tests and minor fixes to make test work

Change-Id: I341959071c5d78a1580fb516e41a6ccb39f4aa8a