Fixed test data
Fixed tests