Adding AuthorizationPolicy to abstract repeated logic throughout, fixing tests