Added support for both relays to test latches