cleaned up the naming for _retrieveModel so it will be a bit more clear what's happening
removed the unused modelOptions paramter and quickly fixed a test to use the index variable rather than creating a new one