Merge pull request #1000 from jeffreythomas/dev

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