Fixes for the tests in pseudo-stack mode.