Merge branch 'feature/unrepeat-tests' into feature/unrepeats