Started building tests for data layer