Removed for now fullclean on windows - bug? Cleaned up test iterators

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>