Update tests to use NSString categories