Modified tests

Maybe just do the test in all cases, but move the ``ìf```in front of ```fail```instead.