Merge pull request #996 from jeffreythomas/dev

Mantle tests formatting.
api project formatting to conform to checkstyle.