Remove database layer tests, avoid cake pattern ATM
Fix tests