Removing some dependencies and started creating some tests and mocks. By that, I also fixed some methods of the Database class