Fixing random issues with shelter tests.