Small refacto of this test plus relevant assertions