Merge "Fix and move old One Touch Play tests" into sc-dev