BREAK: Added some tests, minor fix in signal