Convert tests to use unique id