Minor test changes on stretch etc