Another Test with loops is passing. Minor bug fixes.