Ready for v2 tests