Migrate test from 1.x to master and make them work