Revamped the block listener

Added in extra tests for the signals