Removing unused code
Adding another test scenario (that is failing)