Update to reflect current state of test failures