Rebased tests

@mbadolato here is the right PR