Add expected commands
Construct user input haystack
Adjust expected commands