Move suitability testing much earlier on, so that cross-platform now works