remove old macro test helpers
fix almost all repository tests