Refactoring, test items.