Fix break

I left off break statements, this address that issue. It also contains a commit for unittesting the D1 generation with fixes I'd forgot to move over.