-fix failed to consider mapping two commands to the same SignalClass then unmapping one
-new test fails and needs to be addressed