Added extra iterators for use with lighting and testcases