refactors Store to ApplicationStore and fixes failing unit test