Data is back to singleton, Fixed unit tests