Another commit for rc 1 test case changes from Holly.