Minor refactoring, new base test cases