v2.0 updates, support new testing samples