Enhance unit cases
Merge branch 's390' of ssh://github.com/zshuo/ohai into s390