Handle failing scenarios
Handle pending and undefined scenarios
Removed commented out code