XCode_Test cleanup

Continued work on integrating index buffer