remove unused store
adding unit testing
Merge remote-tracking branch 'origin/master'