Rebased tests

@mbadolato ^^