Test Fixes - Add Transactional Listener where is needed