Test refactoring, added another test.