Fixing a few AK5->AK4 in tests, and also removing the hack for the MET uncertainty test