Fixed test cases. Fixed issue #26