Merge "Removing a failing test which isn't required." into tm-dev