Fix testing terminology, using "unit" and "integration"

Fixes #192
Indenting
Should also indent C++ files
Indent C++ code