Refactor Listeners
Update test data