db prep and test cleanup#1037

ionous wants to merge 10 commits into

mainshift-org/shift-docs:mainfrom

test-cleanupshift-org/shift-docs:test-cleanupCopy head branch name to clipboard