Added #1 feature with a new sample module. Also refactor JUnit tests and utility classes.