Change PropertyTest to use iterators. #398