refined test cases.
Merge branch 'refined_tests'