Fixed test so that it is also executable in 2.0