some sql for creating a decent test environment, and additional cleanup for feature 21
Merge remote-tracking branch 'origin/develop' into develop