Finish up tests, fix iteration (for the mad mad PHP world)