moved the keystone test command out into separate files because of new command options for icehouse