Fixed installation
Fixed test issue