Fixes to DataModelerServiceTest