Linq tests working again with new complex primary key support