Merge pull request #15 from chuckdumont/master

More unit test fixes
messages_en.properties files