repository project formatting to conform to checkstyle in the tests and src.
Merge pull request #1001 from jeffreythomas/dev

repository project formatting to conform to checkstyle in the tests and ...