Updating more tests, mostly ApproverController.