Fixes for access_control tests