Added flexibility to the test console command system