Added iterator tests, removed filed generated at runtime