Fix issue #125. Add JUnit to clarify issue #128. Add Junit for issue #123 and issue #109.