DATACASS-33: WIP: renames, added first test for compound pk