Added DS check for unit testing