Added IncludeCPP property
Improved whitespace
New test