Updated code to use Hashie:Mash and updated specs to reflect.