Move custom event listener to AkkaSpec. Some cleanup