revised Entity model/structure, which required some overhaul of tests, closes #63