remove some dead code

Signed-off-by: Wilfried Chauveau <ithinuel@gmail.com>
Change to output policy.

Bufferize test result until conclude so failure message can be easily checked.
This will be useful when testing mock failure condition.

Signed-off-by: Wilfried Chauveau <ithinuel@gmail.com>