Fix up unit tests for async read/write changes