adding more test cases including changes in scanner to pass the new test scenarios