test fixes for latest sandstorm (now with locking)