restore cold-start behaviour and fix new warm-start test