Modify test framework to account for recent UI changes.