Fixed tests + ORM service alias definitions