Corrected timer expiration behavior

Corrected expiration behaviour. Could previously be force expired by manually setting remaining time to nonzero and then zero. Should now have more robust behavior. Added unit test to verify behavior.