fixed failing tests, added comments of failing BZs