Work on fixing the tests afternpm update.