Fix ut failures in different environments

Fixes for the table storage failures in issue #761