DataHandler Testing Complete

Changed the order of some DataHandler functions