Failing safely, added more test cases