Test data switch now works