fix flaky tests and possible NPE in blob container