Test DD & Refactor classes