Fixed DB
Fixed test