fixed failing test cases, added new scenarios