Fix test
Signal fixes