Refactoring test cases, work in progress