Abandonded STL iterators for the new parsing

Going to get rid of STL crap eventually anyway.
Consolidated related tests
Iterator is now fully abstracted