Adapted tests to design change