Add more tests, Revert back to C-style for loops