cleanup finding scopes
Fixed fixture organization roles