fixed failing tests, added bz numbers