Untested DataHandler added
Added basic testing for data classes