Minor refactoring and added signal mapper test