BLD-543: Fix bug with reordering in Studio.
Fix tests.
Address comments.