Merge "Move some tests to sdk version o"