typo fixed
avoid dead lock
makes expiring strategy actually to work
more test added
vrc mock