Refactor of getMinimumFee
Tests added. Ready for integration into master.
Merge remote-tracking branch 'origin/feature/#94' into integration/20140929
minor test changes
reformat