Update tests to reflect unique key changes