[TASK] Fix unit tests and update Database ...