Fixed handlers again.  refactored DataManager tests to take advantage of DataHelper