Adopts compatible tests from 7.x-1.x branch