refactored EveWorker and added test for it