Makes all v2.0 tests green