Storage Manager Test changes