Merge "Use correct stacks for testing changes."