Use globalid gem
Fix tests for sucker_punch