Rearranged some tests and added another to cover the disabling of a relay before it has ran for a while