Fixed relative path for tests bootstrap
Merge branch 'v1' into v2