Update tests for new communication glue