There were issues with multi word parameters, so make these tests multiword