Fixing two failing test cases
Merge pull request #2536 from Randy-Ma/working_branch

Fixing two failing test cases