Rename container
add TestNonBlockingIteraton