Fixed test
Fixed build