Fixed test and some details