Fixed bug.
Fixed test-errors.