Updates as stated in PR#20 comments.
Updates as stated in PR#20 comments - removed test method testDefaultMessageOverride.