Fixed signal leak

Removed the leak adding energy when signals are created.
Added the unit tests back. They need to be reworked based on how the
methods are used.