Stores and performance testers fixed