Refactored. Moved testdata to TestDataHelper.