Small refactoring added test data.