Globalize: Corrected return types / amended tests