Better handling of old blocks and tests on old blocks