CommandTest complete using new system