Unit test fixes
Merge https://github.com/sattes/soprepository