Tartaros: Added commented-out code back in for exception handling around setting custom storage location for test.