wip
Merge branch 'master' into gwttest
Fixes #118: rudimentary tests, incl entity factories,