Update unit tests to support 5s default inactivityTimeout