Added docs for tests
More cleanup and commenting.
Converted comments to JavaDoc comments
Merge branch 'ModelTests' into dev