Revert "Remove these role tests"

This reverts commit 17e4073298120c06ffc3b1250dd9638d87e54f51.