Added tests with realistic test data.
Modified test to become integration test.
javadoc
Merge remote-tracking branch 'origin/master'