BZ903 Fix failing tests.