fixed failing tests, commented failing tests with BZ numbers