REGISTER expiration treatment and some unit-tests