[NOJIRA] Fix bad test assumptions
Merge pull request #1014 from yuhunglin/NOJIRA-qa

[NOJIRA] QA: Fix bad test assumptions