Added support for iteration, changed test page layout