Adding CLI for testing