Added storage tests.
Fixed SMP test case.