Rewrited signal module, adapt some tests