Renamed everything from Mercenary to MercenaryPlus and got the tests passing again.
Merge branch 'dev'