Fix tests to match label modifications