Merge pull request #20 from BigMichi1/upgrade_database

fix test for upgrading a table to really test the upgrade path
Minor fixes.
Merge remote-tracking branch 'upstream/master' into alltogether