Get the ID from the right place
Fix up tests