Merge "Clear up setUp in advanced tests" into mcp/ussuri