fixed output
fixed failed tests, added bz ids