Save state and notify of changes only if state has changed
Add test data