Added unit tests failure handling