Cherry pick async-proof changes to callbacks unit test from dev-200 branch
Remove trailing commas