add changes to test classes.  fix compilation issues and logic in test classes.  add javadoc markup to new functions and methods in State.java.
Merge origin/master