Move mock storage initialization and remove storage checks