Modified the signals and added coverage tests.