Refactoring and test case changes.
Merge branch 'master' of https://github.com/modeone-developer/release.note.dsl