More work on foreach, started to add tests, non-functional, still