Add cli tests, fix related bugs
Add cli tests, fix related bugs
Version bump
Ship v0.9.5