Merge "[CC05] Replace expectCallback* with expect"