some more refactoring,  added unit tests for EvaReply handling