Started fixing more tests missing tags/namespaces