Remove obsolete primary.xml
Fit UT to work on files instead of repo api