Fixing test runs for 2.0