refactored Data class, strengthened Data test to 100% coverage, removed DataContainer