Combining junit tests to avoid assumption on the execution order.
Merge pull request #12 from allenxwang/master

Fix junit test.