Add primary type to test indicators so that they pass primary filters
Remove DPSIR attributes as they are not applicable on this branch