Initial refactor.  Iterator tests still failing

USERGRID-1401