Add test for multi-part PKs also work correctly