fixing tests
fix tests
tidy up
Merge branch 'feature/entlib6' into develop