Updating tests and adding 'ExistsInDatastore' check