Remove out-of-class code
Test iterator
Testing dir