Merge pull request #1 from kassio/bs-kb-fix-primary-key

Add some tests to drive us better