Make tests pass. Added back -role filter, which just inserts another tag, which goes through the normal tags filtering.