fix tests to reflect more consistent use of non-integer/non-id primary keys and alias as foreign key identifiers