Merge "CLI acommadation to the current test case calling method"