complete tests of datalayer + fixed error in implementations