[WIP] More unit tests
[FOLD] fix iterator test