refactor Data objects, add stats test methods