Fixes for Pash, return tests