last modifications for the test v2