Partially through refactoring cases.
Refactored test cases.