Changed database root
Better tests