[NOJIRA] Test fixes
[NOJIRA] More test fixes
Merge pull request #680 from yuhunglin/NOJIRA7

[NOJIRA] Test fixes