DataModelerServiceTest improved