fixed and improved data service tests