Fix tests
building primary key tests
Merge remote-tracking branch 'upstream/master'