Fixed test and updated Solo