Entity update
Merge branch 'Tests' of https://github.com/coffeine-009/Virtuoso into Tests