Include extras tests in CLI tests