Make all current tests pass AND fix `publish` with `async` option set