Working on supporting shallow stacks in unit test helpers