Making the unhappy path work

* simplify tests