More tests
Fix formatting bug in cli