Fix comments, imports, and spacing. Add diagnostics to testing

parent 755c4422

This commit is part of merge request !33. Comments created here will be created in the context of that merge request.