Fix loops

Break out loop test suites
Fixes #5