Fixes signals and complete test coverage