Refactoring to the basic test cases.