Fix existing stack tests