Add keystone arg to subcommands

Tests are currently broken without this.