Update csvreader test to use C++11 features.
Update cyclic_iterator test to use C++11 features