Updated tests to use the wrangling changes