Commited fix and test from cm-rudolph for JAVAMONEY-78.