Added Unit testing for all relivant classes