Add more control to cmd line for test