Fixing up test cases following render pass changes