Began baseic data layer unit tests and updates for tweeks to other
classes