additional helper test; touch-ups
remove mockup templates
bumped version to 0.3.1
Merge branch 'release-0.3.1' into dev