Improved tests, removed events from store