Two steps forward, one step back. Moving some of the branching logic into the SignalHandler class seems to have broken the edit testing. My plan is to alter SignalHandler so that it has objects passed into its methods, instead of embedding them in the object itself.