Updated some failing tests.