Added more direct CLI tests