Got a few more cli-tests passing