Fix test suite for V7