Refactors tests for evt pump