And update tests for multi-block usage

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>