Changes per feedback from Artem - additional javadoc comments, cleaned up tests