Test needs to be a little more robust
Clone params too
Last few test and integration issues sorted