Merge "Move disabled test out" into sc-dev