Improved move index test