Changelog entry for previous changeset for issue #155
Refactor the testing framework into a separate module
Merge remote-tracking branch 'origin/master'