started adding as-role watch expression, currently tests are failing but working on it