Adapted test cases to refactorings.