Tweak CLI
Use ava for testing