Added better testing for Agenda permissions and minor metric improvements