Fixed ng signaling, created new tests