Minor changes
Fixed test suite