Add @model specific tests to validate output.

#568
Addressed stylecop and CR issues.

#568