Fix Test Failures

This fixes two test failures introduced when we sync'd batching child markup generation.