Minor formatting
Improving tests to see if a signal has an indicator before checking where the indicator is pointing