refactoring entity/orm and docblocks
use db asgard for tests