Updated Unit Testers & DataManager