Minor changes to fix unique test