Fix/simplify tests under sauce