Fix Repository specs on 1.8
Add some CLI specs