refactor TestStorage