Merge "mark a VTS tests as not unit tests"