Update. Adding test also for database store.