From f5ef2a06f0ce367239a645f2ad28b771589532cf Mon Sep 17 00:00:00 2001
From: Paul Tarjan <ptarjan@fb.com>
Date: Mon, 22 Apr 2013 18:31:04 -0700
Subject: [PATCH] import zend mbstring tests

---
 hphp/test/zend/bad/ext-mbstring/bug20087.php  |   9 +
 .../bad/ext-mbstring/bug20087.php.expectf     |   4 +
 hphp/test/zend/bad/ext-mbstring/bug26639.php  |  67 ++
 .../bad/ext-mbstring/bug26639.php.expectf     |  50 +
 hphp/test/zend/bad/ext-mbstring/bug28220.php  |  17 +
 .../bad/ext-mbstring/bug28220.php.expectf     |   2 +
 hphp/test/zend/bad/ext-mbstring/bug40685.php  |  11 +
 .../bad/ext-mbstring/bug40685.php.expectf     |   8 +
 hphp/test/zend/bad/ext-mbstring/bug43301.php  |  11 +
 .../bad/ext-mbstring/bug43301.php.expectf     |   3 +
 hphp/test/zend/bad/ext-mbstring/bug43840.php  |  25 +
 .../bad/ext-mbstring/bug43840.php.expectf     |  35 +
 hphp/test/zend/bad/ext-mbstring/bug43841.php  |  27 +
 .../bad/ext-mbstring/bug43841.php.expectf     |  41 +
 hphp/test/zend/bad/ext-mbstring/bug43994.php  |  31 +
 .../bad/ext-mbstring/bug43994.php.expectf     |  71 ++
 hphp/test/zend/bad/ext-mbstring/bug43998.php  |  22 +
 .../bad/ext-mbstring/bug43998.php.expectf     |  29 +
 hphp/test/zend/bad/ext-mbstring/bug48697.php  |  13 +
 .../bad/ext-mbstring/bug48697.php.expectf     |   5 +
 hphp/test/zend/bad/ext-mbstring/bug49536.php  |  10 +
 .../bad/ext-mbstring/bug49536.php.expectf     |   4 +
 hphp/test/zend/bad/ext-mbstring/bug52981.php  |  14 +
 .../bad/ext-mbstring/bug52981.php.expectf     |   3 +
 .../ext-mbstring/illformed_utf_sequences.php  | 151 +++
 .../illformed_utf_sequences.php.expectf       |  60 ++
 .../mb_decode_mimeheader_variation1.php       | 109 +++
 ...b_decode_mimeheader_variation1.php.expectf |  86 ++
 .../mb_encode_mimeheader_basic.php            |  39 +
 .../mb_encode_mimeheader_basic.php.expectf    |  25 +
 .../mb_encode_mimeheader_basic2.php           |  34 +
 .../mb_encode_mimeheader_basic2.php.expectf   |  29 +
 .../mb_encode_mimeheader_basic3.php           |  34 +
 .../mb_encode_mimeheader_basic3.php.expectf   |  25 +
 .../mb_encode_mimeheader_indent.php           |  27 +
 .../mb_encode_mimeheader_indent.php.expectf   | 863 ++++++++++++++++++
 .../mb_encode_mimeheader_variation1.php       |  99 ++
 ...b_encode_mimeheader_variation1.php.expectf |  75 ++
 .../mb_encode_mimeheader_variation2.php       | 101 ++
 ...b_encode_mimeheader_variation2.php.expectf |  94 ++
 .../mb_encode_mimeheader_variation3.php       | 101 ++
 ...b_encode_mimeheader_variation3.php.expectf |  75 ++
 .../mb_encode_mimeheader_variation4.php       | 102 +++
 ...b_encode_mimeheader_variation4.php.expectf |  75 ++
 .../mb_encode_mimeheader_variation5.php       | 101 ++
 ...b_encode_mimeheader_variation5.php.expectf |  98 ++
 .../mb_encode_mimeheader_variation6.php       |  30 +
 ...b_encode_mimeheader_variation6.php.expectf |  13 +
 .../bad/ext-mbstring/mb_encoding_aliases.php  |   8 +
 .../mb_encoding_aliases.php.expectf           |  31 +
 hphp/test/zend/bad/ext-mbstring/mb_ereg1.php  |  16 +
 .../bad/ext-mbstring/mb_ereg1.php.expectf     |  52 ++
 hphp/test/zend/bad/ext-mbstring/mb_ereg2.php  |  14 +
 .../bad/ext-mbstring/mb_ereg2.php.expectf     |  20 +
 hphp/test/zend/bad/ext-mbstring/mb_ereg3.php  |  14 +
 .../bad/ext-mbstring/mb_ereg3.php.expectf     |  20 +
 hphp/test/zend/bad/ext-mbstring/mb_ereg4.php  |  14 +
 .../bad/ext-mbstring/mb_ereg4.php.expectf     |  20 +
 .../zend/bad/ext-mbstring/mb_ereg_basic.php   |  69 ++
 .../ext-mbstring/mb_ereg_basic.php.expectf    |  38 +
 .../zend/bad/ext-mbstring/mb_ereg_error.php   |  28 +
 .../ext-mbstring/mb_ereg_error.php.expectf    |  10 +
 .../bad/ext-mbstring/mb_ereg_match_error1.php |  32 +
 .../mb_ereg_match_error1.php.expectf          |  14 +
 .../ext-mbstring/mb_ereg_replace_callback.php |   4 +
 .../mb_ereg_replace_callback.php.expectf      |   1 +
 .../ext-mbstring/mb_ereg_replace_error.php    |  26 +
 .../mb_ereg_replace_error.php.expectf         |  10 +
 .../mb_ereg_replace_variation2.php            |  93 ++
 .../mb_ereg_replace_variation2.php.expectf    |  75 ++
 .../mb_ereg_replace_variation3.php            |  94 ++
 .../mb_ereg_replace_variation3.php.expectf    |  75 ++
 .../mb_ereg_replace_variation4.php            |  94 ++
 .../mb_ereg_replace_variation4.php.expectf    |  75 ++
 .../bad/ext-mbstring/mb_ereg_search_pos.php   |  15 +
 .../mb_ereg_search_pos.php.expectf            |   6 +
 .../bad/ext-mbstring/mb_ereg_search_regs.php  |  15 +
 .../mb_ereg_search_regs.php.expectf           |   4 +
 .../bad/ext-mbstring/mb_ereg_variation2.php   | 100 ++
 .../mb_ereg_variation2.php.expectf            | 105 +++
 .../bad/ext-mbstring/mb_ereg_variation5.php   |  55 ++
 .../mb_ereg_variation5.php.expectf            |  18 +
 hphp/test/zend/bad/ext-mbstring/mb_eregi.php  |   8 +
 .../bad/ext-mbstring/mb_eregi.php.expectf     |   3 +
 .../mb_eregi_invalid_arguments.php            |   8 +
 .../mb_eregi_invalid_arguments.php.expectf    |   3 +
 .../zend/bad/ext-mbstring/mb_http_input.php   |  36 +
 .../ext-mbstring/mb_http_input.php.expectf    |   3 +
 .../zend/bad/ext-mbstring/mb_http_output.php  |  56 ++
 .../ext-mbstring/mb_http_output.php.expectf   |  20 +
 .../bad/ext-mbstring/mb_internal_encoding.php |  44 +
 .../mb_internal_encoding.php.expectf          |  16 +
 .../mb_internal_encoding_error1.php           |  20 +
 .../mb_internal_encoding_error1.php.expectf   |   6 +
 .../mb_internal_encoding_variation1.php       |  93 ++
 ...b_internal_encoding_variation1.php.expectf |  94 ++
 .../mb_internal_encoding_variation2.php       |  82 ++
 ...b_internal_encoding_variation2.php.expectf | 282 ++++++
 .../mb_regex_encoding_variation1.php          |  92 ++
 .../mb_regex_encoding_variation1.php.expectf  |  94 ++
 .../bad/ext-mbstring/mb_regex_set_options.php |   7 +
 .../mb_regex_set_options.php.expectf          |   1 +
 .../bad/ext-mbstring/mb_split_empty_match.php |   3 +
 .../mb_split_empty_match.php.expectf          |  10 +
 .../zend/bad/ext-mbstring/mb_split_error.php  |  29 +
 .../ext-mbstring/mb_split_error.php.expectf   |  10 +
 .../bad/ext-mbstring/mb_split_variation1.php  |  92 ++
 .../mb_split_variation1.php.expectf           | 144 +++
 .../bad/ext-mbstring/mb_split_variation2.php  |  94 ++
 .../mb_split_variation2.php.expectf           | 144 +++
 .../bad/ext-mbstring/mb_split_variation3.php  |  93 ++
 .../mb_split_variation3.php.expectf           | 222 +++++
 .../mb_str_functions_opt-parameter.php        |  14 +
 ...mb_str_functions_opt-parameter.php.expectf |  12 +
 .../test/zend/bad/ext-mbstring/mb_stripos.php | 110 +++
 .../bad/ext-mbstring/mb_stripos.php.expectf   |  57 ++
 .../bad/ext-mbstring/mb_stripos_error1.php    |  30 +
 .../mb_stripos_error1.php.expectf             |  10 +
 .../bad/ext-mbstring/mb_stripos_error2.php    |  21 +
 .../mb_stripos_error2.php.expectf             |   4 +
 .../ext-mbstring/mb_stripos_variation1.php    |  98 ++
 .../mb_stripos_variation1.php.expectf         |  75 ++
 .../ext-mbstring/mb_stripos_variation2.php    |  98 ++
 .../mb_stripos_variation2.php.expectf         |  83 ++
 .../ext-mbstring/mb_stripos_variation3.php    |  98 ++
 .../mb_stripos_variation3.php.expectf         |  85 ++
 .../ext-mbstring/mb_stripos_variation4.php    |  99 ++
 .../mb_stripos_variation4.php.expectf         |  94 ++
 .../bad/ext-mbstring/mb_stristr_error1.php    |  26 +
 .../mb_stristr_error1.php.expectf             |  10 +
 .../ext-mbstring/mb_stristr_variation1.php    | 112 +++
 .../mb_stristr_variation1.php.expectf         |  86 ++
 .../ext-mbstring/mb_stristr_variation2.php    | 112 +++
 .../mb_stristr_variation2.php.expectf         |  94 ++
 .../ext-mbstring/mb_stristr_variation3.php    | 124 +++
 .../mb_stristr_variation3.php.expectf         |  99 ++
 .../ext-mbstring/mb_stristr_variation4.php    | 112 +++
 .../mb_stristr_variation4.php.expectf         | 106 +++
 .../bad/ext-mbstring/mb_strlen_error1.php     |  25 +
 .../ext-mbstring/mb_strlen_error1.php.expectf |  10 +
 .../bad/ext-mbstring/mb_strlen_variation1.php |  95 ++
 .../mb_strlen_variation1.php.expectf          |  75 ++
 .../bad/ext-mbstring/mb_strlen_variation2.php |  96 ++
 .../mb_strlen_variation2.php.expectf          |  94 ++
 hphp/test/zend/bad/ext-mbstring/mb_strpos.php | 110 +++
 .../bad/ext-mbstring/mb_strpos.php.expectf    |  57 ++
 .../bad/ext-mbstring/mb_strpos_error1.php     |  29 +
 .../ext-mbstring/mb_strpos_error1.php.expectf |  10 +
 .../bad/ext-mbstring/mb_strpos_variation1.php |  97 ++
 .../mb_strpos_variation1.php.expectf          |  75 ++
 .../bad/ext-mbstring/mb_strpos_variation2.php |  97 ++
 .../mb_strpos_variation2.php.expectf          |  83 ++
 .../bad/ext-mbstring/mb_strpos_variation3.php |  97 ++
 .../mb_strpos_variation3.php.expectf          |  85 ++
 .../bad/ext-mbstring/mb_strpos_variation4.php |  98 ++
 .../mb_strpos_variation4.php.expectf          |  94 ++
 .../bad/ext-mbstring/mb_strrchr_error1.php    |  26 +
 .../mb_strrchr_error1.php.expectf             |  10 +
 .../ext-mbstring/mb_strrchr_variation1.php    | 112 +++
 .../mb_strrchr_variation1.php.expectf         |  86 ++
 .../ext-mbstring/mb_strrchr_variation2.php    | 112 +++
 .../mb_strrchr_variation2.php.expectf         |  86 ++
 .../ext-mbstring/mb_strrchr_variation3.php    | 124 +++
 .../mb_strrchr_variation3.php.expectf         |  99 ++
 .../ext-mbstring/mb_strrchr_variation4.php    | 112 +++
 .../mb_strrchr_variation4.php.expectf         | 106 +++
 .../bad/ext-mbstring/mb_strrichr_error1.php   |  26 +
 .../mb_strrichr_error1.php.expectf            |  10 +
 .../ext-mbstring/mb_strrichr_variation1.php   | 112 +++
 .../mb_strrichr_variation1.php.expectf        |  86 ++
 .../ext-mbstring/mb_strrichr_variation2.php   | 112 +++
 .../mb_strrichr_variation2.php.expectf        |  86 ++
 .../ext-mbstring/mb_strrichr_variation3.php   | 124 +++
 .../mb_strrichr_variation3.php.expectf        |  99 ++
 .../ext-mbstring/mb_strrichr_variation4.php   | 112 +++
 .../mb_strrichr_variation4.php.expectf        | 106 +++
 .../bad/ext-mbstring/mb_strripos_error1.php   |  30 +
 .../mb_strripos_error1.php.expectf            |  10 +
 .../bad/ext-mbstring/mb_strripos_error2.php   |  21 +
 .../mb_strripos_error2.php.expectf            |   4 +
 .../ext-mbstring/mb_strripos_variation1.php   |  98 ++
 .../mb_strripos_variation1.php.expectf        |  75 ++
 .../ext-mbstring/mb_strripos_variation2.php   |  98 ++
 .../mb_strripos_variation2.php.expectf        |  75 ++
 .../mb_strripos_variation3_Bug45923.php       |  98 ++
 ...b_strripos_variation3_Bug45923.php.expectf |  86 ++
 .../ext-mbstring/mb_strripos_variation4.php   |  99 ++
 .../mb_strripos_variation4.php.expectf        |  94 ++
 .../bad/ext-mbstring/mb_strrpos_error1.php    |  29 +
 .../mb_strrpos_error1.php.expectf             |  10 +
 .../bad/ext-mbstring/mb_strrpos_error2.php    |  21 +
 .../mb_strrpos_error2.php.expectf             |   4 +
 .../ext-mbstring/mb_strrpos_variation1.php    |  95 ++
 .../mb_strrpos_variation1.php.expectf         |  75 ++
 .../ext-mbstring/mb_strrpos_variation2.php    |  97 ++
 .../mb_strrpos_variation2.php.expectf         |  75 ++
 .../ext-mbstring/mb_strrpos_variation3.php    |  80 ++
 .../mb_strrpos_variation3.php.expectf         |  60 ++
 .../ext-mbstring/mb_strrpos_variation4.php    |  98 ++
 .../mb_strrpos_variation4.php.expectf         |  94 ++
 .../bad/ext-mbstring/mb_strstr_error1.php     |  26 +
 .../ext-mbstring/mb_strstr_error1.php.expectf |  10 +
 .../bad/ext-mbstring/mb_strstr_variation1.php | 112 +++
 .../mb_strstr_variation1.php.expectf          |  86 ++
 .../bad/ext-mbstring/mb_strstr_variation2.php | 112 +++
 .../mb_strstr_variation2.php.expectf          |  94 ++
 .../bad/ext-mbstring/mb_strstr_variation3.php | 124 +++
 .../mb_strstr_variation3.php.expectf          |  99 ++
 .../bad/ext-mbstring/mb_strstr_variation4.php | 112 +++
 .../mb_strstr_variation4.php.expectf          | 106 +++
 .../bad/ext-mbstring/mb_strtolower_error2.php |  18 +
 .../mb_strtolower_error2.php.expectf          |   4 +
 .../ext-mbstring/mb_strtolower_variation1.php |  93 ++
 .../mb_strtolower_variation1.php.expectf      |  75 ++
 .../ext-mbstring/mb_strtolower_variation2.php | 102 +++
 .../mb_strtolower_variation2.php.expectf      |  94 ++
 .../bad/ext-mbstring/mb_strtoupper_error2.php |  19 +
 .../mb_strtoupper_error2.php.expectf          |   4 +
 .../ext-mbstring/mb_strtoupper_variation1.php |  95 ++
 .../mb_strtoupper_variation1.php.expectf      |  75 ++
 .../ext-mbstring/mb_strtoupper_variation2.php | 102 +++
 .../mb_strtoupper_variation2.php.expectf      |  94 ++
 .../mb_substitute_character_variation1.php    | 113 +++
 ...ubstitute_character_variation1.php.expectf | 108 +++
 .../mb_substr_count_variation1.php            |  97 ++
 .../mb_substr_count_variation1.php.expectf    |  75 ++
 .../mb_substr_count_variation2.php            |  95 ++
 .../mb_substr_count_variation2.php.expectf    |  83 ++
 .../mb_substr_count_variation3.php            |  97 ++
 .../mb_substr_count_variation3.php.expectf    |  94 ++
 .../bad/ext-mbstring/mb_substr_variation1.php |  95 ++
 .../mb_substr_variation1.php.expectf          |  75 ++
 .../bad/ext-mbstring/mb_substr_variation2.php | 103 +++
 .../mb_substr_variation2.php.expectf          |  94 ++
 .../zend/bad/ext-mbstring/php_gr_jp_10830.php |   6 +
 .../ext-mbstring/php_gr_jp_10830.php.expectf  |   4 +
 .../bad/ext-mbstring/php_gr_jp_dev_884-1.php  |   6 +
 .../php_gr_jp_dev_884-1.php.expectf           |   4 +
 .../bad/ext-mbstring/php_gr_jp_dev_884-2.php  |   6 +
 .../php_gr_jp_dev_884-2.php.expectf           |   8 +
 .../test/zend/bad/ext-mbstring/pictogram1.php |  96 ++
 .../bad/ext-mbstring/pictogram1.php.expectf   |  70 ++
 .../bad/ext-mbstring/zend_multibyte-12.php    |   5 +
 .../zend_multibyte-12.php.expectf             |   1 +
 hphp/test/zend/good/ext-mbstring/bug25140.php |   3 +
 .../good/ext-mbstring/bug25140.php.expectf    |   1 +
 hphp/test/zend/good/ext-mbstring/bug30549.php |  15 +
 .../good/ext-mbstring/bug30549.php.expectf    |  10 +
 hphp/test/zend/good/ext-mbstring/bug31911.php |   5 +
 .../good/ext-mbstring/bug31911.php.expectf    |   2 +
 hphp/test/zend/good/ext-mbstring/bug43993.php |  11 +
 .../good/ext-mbstring/bug43993.php.expectf    |   9 +
 hphp/test/zend/good/ext-mbstring/bug45722.php |   3 +
 .../good/ext-mbstring/bug45722.php.expectf    |   1 +
 hphp/test/zend/good/ext-mbstring/bug46806.php |   4 +
 .../good/ext-mbstring/bug46806.php.expectf    |   2 +
 hphp/test/zend/good/ext-mbstring/bug46843.php |   4 +
 .../good/ext-mbstring/bug46843.php.expectf    |   2 +
 hphp/test/zend/good/ext-mbstring/bug47399.php |   7 +
 .../good/ext-mbstring/bug47399.php.expectf    | 512 +++++++++++
 hphp/test/zend/good/ext-mbstring/bug48645.php |  79 ++
 .../good/ext-mbstring/bug48645.php.expectf    |  77 ++
 hphp/test/zend/good/ext-mbstring/bug49354.php |   9 +
 .../good/ext-mbstring/bug49354.php.expectf    |   6 +
 hphp/test/zend/good/ext-mbstring/bug49528.php |   8 +
 .../good/ext-mbstring/bug49528.php.expectf    |   6 +
 hphp/test/zend/good/ext-mbstring/bug54494.php |  39 +
 .../good/ext-mbstring/bug54494.php.expectf    |   6 +
 hphp/test/zend/good/ext-mbstring/bug60306.php |   4 +
 .../good/ext-mbstring/bug60306.php.expectf    |   1 +
 hphp/test/zend/good/ext-mbstring/common.inc   |  55 ++
 .../zend/good/ext-mbstring/empty_pattern.php  |   7 +
 .../ext-mbstring/empty_pattern.php.expectf    |   2 +
 .../mb_convert_encoding_basic.php             |  52 ++
 .../mb_convert_encoding_basic.php.expectf     |  34 +
 .../mb_convert_encoding_variation1.php        |  97 ++
 ...mb_convert_encoding_variation1.php.expectf |  87 ++
 .../good/ext-mbstring/mb_convert_kana.php     |  35 +
 .../ext-mbstring/mb_convert_kana.php.expectf  |  11 +
 .../mb_decode_mimeheader_basic.php            |  22 +
 .../mb_decode_mimeheader_basic.php.expectf    |   4 +
 .../mb_decode_mimeheader_error.php            |  21 +
 .../mb_decode_mimeheader_error.php.expectf    |  10 +
 .../mb_decode_mimeheader_variation2.php       |  34 +
 ...b_decode_mimeheader_variation2.php.expectf |   8 +
 .../mb_decode_mimeheader_variation3.php       |  17 +
 ...b_decode_mimeheader_variation3.php.expectf |   3 +
 .../ext-mbstring/mb_decode_numericentity.php  |   9 +
 .../mb_decode_numericentity.php.expectf       |   3 +
 .../ext-mbstring/mb_encode_numericentity.php  |  10 +
 .../mb_encode_numericentity.php.expectf       |   3 +
 .../good/ext-mbstring/mb_ereg-compat-01.php   |  10 +
 .../mb_ereg-compat-01.php.expectf             |   2 +
 .../good/ext-mbstring/mb_ereg-compat-02.php   |  12 +
 .../mb_ereg-compat-02.php.expectf             |   4 +
 .../good/ext-mbstring/mb_ereg_match_basic.php |  35 +
 .../mb_ereg_match_basic.php.expectf           |  14 +
 .../mb_ereg_replace-compat-01.php             |   5 +
 .../mb_ereg_replace-compat-01.php.expectf     |   1 +
 .../mb_ereg_replace-compat-02.php             |   5 +
 .../mb_ereg_replace-compat-02.php.expectf     |   1 +
 .../mb_ereg_replace-compat-03.php             |   5 +
 .../mb_ereg_replace-compat-03.php.expectf     |   1 +
 .../mb_ereg_replace-compat-04.php             |   5 +
 .../mb_ereg_replace-compat-04.php.expectf     |   1 +
 .../mb_ereg_replace-compat-05.php             |   6 +
 .../mb_ereg_replace-compat-05.php.expectf     |   1 +
 .../mb_ereg_replace-compat-06.php             |   4 +
 .../mb_ereg_replace-compat-06.php.expectf     |   1 +
 .../mb_ereg_replace-compat-07.php             |   5 +
 .../mb_ereg_replace-compat-07.php.expectf     |   1 +
 .../mb_ereg_replace-compat-08.php             |   5 +
 .../mb_ereg_replace-compat-08.php.expectf     |   1 +
 .../mb_ereg_replace-compat-09.php             |   5 +
 .../mb_ereg_replace-compat-09.php.expectf     |   1 +
 .../mb_ereg_replace-compat-10.php             |   5 +
 .../mb_ereg_replace-compat-10.php.expectf     |   1 +
 .../mb_ereg_replace-compat-11.php             |   5 +
 .../mb_ereg_replace-compat-11.php.expectf     |   1 +
 .../mb_ereg_replace-compat-12.php             |   4 +
 .../mb_ereg_replace-compat-12.php.expectf     |   1 +
 .../mb_ereg_replace-compat-13.php             |   4 +
 .../mb_ereg_replace-compat-13.php.expectf     |   1 +
 .../good/ext-mbstring/mb_ereg_replace.php     |   5 +
 .../ext-mbstring/mb_ereg_replace.php.expectf  |   2 +
 .../ext-mbstring/mb_ereg_replace_basic.php    |  39 +
 .../mb_ereg_replace_basic.php.expectf         |  14 +
 .../zend/good/ext-mbstring/mb_ereg_search.php |  25 +
 .../ext-mbstring/mb_ereg_search.php.expectf   |   5 +
 .../good/ext-mbstring/mb_ereg_variation1.php  |  83 ++
 .../mb_ereg_variation1.php.expectf            |  72 ++
 .../good/ext-mbstring/mb_ereg_variation3.php  |  63 ++
 .../mb_ereg_variation3.php.expectf            |  86 ++
 .../good/ext-mbstring/mb_ereg_variation4.php  |  67 ++
 .../mb_ereg_variation4.php.expectf            |  73 ++
 .../good/ext-mbstring/mb_ereg_variation6.php  |  71 ++
 .../mb_ereg_variation6.php.expectf            | 112 +++
 .../good/ext-mbstring/mb_ereg_variation7.php  |  56 ++
 .../mb_ereg_variation7.php.expectf            |  29 +
 .../good/ext-mbstring/mb_eregi_replace.php    |  25 +
 .../ext-mbstring/mb_eregi_replace.php.expectf |   1 +
 .../mb_internal_encoding_basic.php            |  22 +
 .../mb_internal_encoding_basic.php.expectf    |   5 +
 .../mb_internal_encoding_error2.php           |  17 +
 .../mb_internal_encoding_error2.php.expectf   |   4 +
 .../good/ext-mbstring/mb_list_encodings.php   |   6 +
 .../mb_list_encodings.php.expectf             |   4 +
 .../ext-mbstring/mb_output_handler_euc_jp.php |  13 +
 .../mb_output_handler_euc_jp.php.expectf      |   1 +
 .../ext-mbstring/mb_preferred_mime_name.php   |  41 +
 .../mb_preferred_mime_name.php.expectf        |  12 +
 .../ext-mbstring/mb_regex_encoding_basic.php  |  21 +
 .../mb_regex_encoding_basic.php.expectf       |   5 +
 .../ext-mbstring/mb_regex_encoding_error1.php |  20 +
 .../mb_regex_encoding_error1.php.expectf      |   6 +
 .../ext-mbstring/mb_regex_encoding_error2.php |  17 +
 .../mb_regex_encoding_error2.php.expectf      |   4 +
 .../mb_regex_encoding_variation2.php          |  81 ++
 .../mb_regex_encoding_variation2.php.expectf  | 306 +++++++
 .../good/ext-mbstring/mb_split-compat-01.php  |   9 +
 .../mb_split-compat-01.php.expectf            |   5 +
 .../mb_strcut_missing_boundary_check.php      |  15 +
 ..._strcut_missing_boundary_check.php.expectf |   7 +
 .../good/ext-mbstring/mb_stripos_basic.php    |  91 ++
 .../ext-mbstring/mb_stripos_basic.php.expectf |  58 ++
 .../good/ext-mbstring/mb_stripos_basic2.php   |  65 ++
 .../mb_stripos_basic2.php.expectf             |  54 ++
 .../mb_stripos_variation5_Bug45923.php        |  38 +
 ...mb_stripos_variation5_Bug45923.php.expectf |  60 ++
 .../good/ext-mbstring/mb_stristr_basic.php    |  43 +
 .../ext-mbstring/mb_stristr_basic.php.expectf |  18 +
 .../good/ext-mbstring/mb_stristr_error2.php   |  19 +
 .../mb_stristr_error2.php.expectf             |   6 +
 .../ext-mbstring/mb_stristr_variation5.php    |  42 +
 .../mb_stristr_variation5.php.expectf         |  18 +
 .../good/ext-mbstring/mb_strlen_basic.php     |  24 +
 .../ext-mbstring/mb_strlen_basic.php.expectf  |   9 +
 .../good/ext-mbstring/mb_strlen_error2.php    |  20 +
 .../ext-mbstring/mb_strlen_error2.php.expectf |   4 +
 .../ext-mbstring/mb_strlen_variation3.php     |  98 ++
 .../mb_strlen_variation3.php.expectf          | 338 +++++++
 .../good/ext-mbstring/mb_strpos_basic.php     |  34 +
 .../ext-mbstring/mb_strpos_basic.php.expectf  |  14 +
 .../good/ext-mbstring/mb_strpos_error2.php    |  20 +
 .../ext-mbstring/mb_strpos_error2.php.expectf |   4 +
 .../ext-mbstring/mb_strpos_variation5.php     |  37 +
 .../mb_strpos_variation5.php.expectf          |  60 ++
 .../good/ext-mbstring/mb_strrchr_basic.php    |  37 +
 .../ext-mbstring/mb_strrchr_basic.php.expectf |  18 +
 .../good/ext-mbstring/mb_strrchr_error2.php   |  19 +
 .../mb_strrchr_error2.php.expectf             |   6 +
 .../ext-mbstring/mb_strrchr_variation5.php    |  42 +
 .../mb_strrchr_variation5.php.expectf         |   8 +
 .../ext-mbstring/mb_strrchr_variation6.php    |  46 +
 .../mb_strrchr_variation6.php.expectf         |  10 +
 .../good/ext-mbstring/mb_strrichr_basic.php   |  43 +
 .../mb_strrichr_basic.php.expectf             |  18 +
 .../good/ext-mbstring/mb_strrichr_error2.php  |  19 +
 .../mb_strrichr_error2.php.expectf            |   6 +
 .../ext-mbstring/mb_strrichr_variation5.php   |  42 +
 .../mb_strrichr_variation5.php.expectf        |  18 +
 .../good/ext-mbstring/mb_strripos_basic.php   |  91 ++
 .../mb_strripos_basic.php.expectf             |  58 ++
 .../good/ext-mbstring/mb_strripos_basic2.php  |  65 ++
 .../mb_strripos_basic2.php.expectf            |  54 ++
 .../mb_strripos_variation5_Bug45923.php       |  38 +
 ...b_strripos_variation5_Bug45923.php.expectf |  58 ++
 .../good/ext-mbstring/mb_strrpos_basic.php    |  34 +
 .../ext-mbstring/mb_strrpos_basic.php.expectf |  14 +
 .../ext-mbstring/mb_strrpos_variation5.php    |  32 +
 .../mb_strrpos_variation5.php.expectf         |  20 +
 .../good/ext-mbstring/mb_strstr_basic.php     |  37 +
 .../ext-mbstring/mb_strstr_basic.php.expectf  |  18 +
 .../good/ext-mbstring/mb_strstr_error2.php    |  19 +
 .../ext-mbstring/mb_strstr_error2.php.expectf |   6 +
 .../ext-mbstring/mb_strstr_variation5.php     |  42 +
 .../mb_strstr_variation5.php.expectf          |   8 +
 .../ext-mbstring/mb_strstr_variation6.php     |  46 +
 .../mb_strstr_variation6.php.expectf          |  10 +
 .../good/ext-mbstring/mb_strtolower_basic.php |  39 +
 .../mb_strtolower_basic.php.expectf           |  10 +
 .../ext-mbstring/mb_strtolower_error1.php     |  25 +
 .../mb_strtolower_error1.php.expectf          |  10 +
 .../ext-mbstring/mb_strtolower_variation3.php |  37 +
 .../mb_strtolower_variation3.php.expectf      |  10 +
 .../ext-mbstring/mb_strtolower_variation4.php |  32 +
 .../mb_strtolower_variation4.php.expectf      |  14 +
 .../good/ext-mbstring/mb_strtoupper_basic.php |  40 +
 .../mb_strtoupper_basic.php.expectf           |  10 +
 .../ext-mbstring/mb_strtoupper_error1.php     |  25 +
 .../mb_strtoupper_error1.php.expectf          |  10 +
 .../ext-mbstring/mb_strtoupper_variation3.php |  38 +
 .../mb_strtoupper_variation3.php.expectf      |  10 +
 .../ext-mbstring/mb_strtoupper_variation4.php |  33 +
 .../mb_strtoupper_variation4.php.expectf      |  14 +
 .../zend/good/ext-mbstring/mb_strwidth.php    |  24 +
 .../good/ext-mbstring/mb_strwidth.php.expectf |   1 +
 .../ext-mbstring/mb_substitute_character.php  |  25 +
 .../mb_substitute_character.php.expectf       |  14 +
 .../mb_substitute_character_basic.php         |  22 +
 .../mb_substitute_character_basic.php.expectf |  11 +
 .../mb_substitute_character_error.php         |  18 +
 .../mb_substitute_character_error.php.expectf |   6 +
 .../mb_substitute_character_variation2.php    |  24 +
 ...ubstitute_character_variation2.php.expectf |   6 +
 .../ext-mbstring/mb_substr_count_basic.php    |  28 +
 .../mb_substr_count_basic.php.expectf         |  10 +
 .../ext-mbstring/mb_substr_count_error1.php   |  28 +
 .../mb_substr_count_error1.php.expectf        |  10 +
 .../ext-mbstring/mb_substr_count_error2.php   |  21 +
 .../mb_substr_count_error2.php.expectf        |   6 +
 .../mb_substr_count_variation4.php            |  27 +
 .../mb_substr_count_variation4.php.expectf    |   8 +
 .../good/ext-mbstring/mb_substr_error1.php    |  28 +
 .../ext-mbstring/mb_substr_error1.php.expectf |  10 +
 .../good/ext-mbstring/mb_substr_error2.php    |  21 +
 .../ext-mbstring/mb_substr_error2.php.expectf |   4 +
 .../ext-mbstring/mb_substr_variation3.php     |  98 ++
 .../mb_substr_variation3.php.expectf          | 338 +++++++
 .../ext-mbstring/mb_substr_variation4.php     |  43 +
 .../mb_substr_variation4.php.expectf          |  80 ++
 .../ext-mbstring/mb_substr_variation5.php     |  44 +
 .../mb_substr_variation5.php.expectf          |  80 ++
 .../ext-mbstring/mb_substr_variation6.php     |  48 +
 .../mb_substr_variation6.php.expectf          |  80 ++
 .../ext-mbstring/mb_substr_variation7.php     |  49 +
 .../mb_substr_variation7.php.expectf          |  80 ++
 .../good/ext-mbstring/zend_multibyte-10.php   |   5 +
 .../zend_multibyte-10.php.expectf             |   1 +
 .../good/ext-mbstring/zend_multibyte-11.php   |   6 +
 .../zend_multibyte-11.php.expectf             |   1 +
 hphp/tools/import_zend_test.py                |   2 +-
 472 files changed, 22262 insertions(+), 1 deletion(-)
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug20087.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug20087.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug26639.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug26639.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug28220.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug28220.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug40685.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug40685.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug43301.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug43301.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug43840.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug43840.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug43841.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug43841.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug43994.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug43994.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug43998.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug43998.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug48697.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug48697.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug49536.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug49536.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug52981.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/bug52981.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/illformed_utf_sequences.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/illformed_utf_sequences.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_decode_mimeheader_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_decode_mimeheader_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_indent.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_indent.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation5.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation5.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encoding_aliases.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_encoding_aliases.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_basic.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_basic.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_callback.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_callback.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_search_pos.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_search_pos.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_search_regs.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_search_regs.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_variation5.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_ereg_variation5.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_eregi.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_eregi.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_eregi_invalid_arguments.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_eregi_invalid_arguments.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_http_input.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_http_input.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_http_output.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_http_output.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_internal_encoding.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_internal_encoding.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_regex_encoding_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_regex_encoding_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_regex_set_options.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_regex_set_options.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_split_empty_match.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_split_empty_match.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_split_error.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_split_error.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_split_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_split_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_split_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_split_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_split_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_split_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_str_functions_opt-parameter.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_str_functions_opt-parameter.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_error2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_error2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_variation4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stripos_variation4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stristr_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stristr_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stristr_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stristr_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stristr_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stristr_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stristr_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stristr_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stristr_variation4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_stristr_variation4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strlen_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strlen_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strlen_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strlen_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strlen_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strlen_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos_variation4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strpos_variation4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrchr_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrchr_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrichr_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrichr_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_error2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_error2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_variation3_Bug45923.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_variation3_Bug45923.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_variation4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strripos_variation4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_error2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_error2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strstr_error1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strstr_error1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strstr_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strstr_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strstr_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strstr_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strstr_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strstr_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strstr_variation4.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strstr_variation4.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtolower_error2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtolower_error2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtoupper_error2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtoupper_error2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substitute_character_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substitute_character_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation3.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation3.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substr_variation1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substr_variation1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substr_variation2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/mb_substr_variation2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/pictogram1.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/pictogram1.php.expectf
 create mode 100644 hphp/test/zend/bad/ext-mbstring/zend_multibyte-12.php
 create mode 100644 hphp/test/zend/bad/ext-mbstring/zend_multibyte-12.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug25140.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug25140.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug30549.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug30549.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug31911.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug31911.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug43993.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug43993.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug45722.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug45722.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug46806.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug46806.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug46843.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug46843.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug47399.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug47399.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug48645.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug48645.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug49354.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug49354.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug49528.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug49528.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug54494.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug54494.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug60306.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/bug60306.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/common.inc
 create mode 100644 hphp/test/zend/good/ext-mbstring/empty_pattern.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/empty_pattern.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_convert_encoding_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_convert_encoding_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_convert_kana.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_convert_kana.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation3.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation3.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_decode_numericentity.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_decode_numericentity.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_encode_numericentity.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_encode_numericentity.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg-compat-01.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg-compat-01.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg-compat-02.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg-compat-02.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_match_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_match_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-01.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-01.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-02.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-02.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-03.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-03.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-04.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-04.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-05.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-05.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-06.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-06.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-07.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-07.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-08.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-08.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-09.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-09.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-10.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-10.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-11.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-11.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-12.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-12.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-13.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-13.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_replace_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_search.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_search.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_variation1.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_variation1.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_variation3.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_variation3.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_variation4.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_variation4.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_variation6.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_variation6.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_variation7.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_ereg_variation7.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_eregi_replace.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_eregi_replace.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_internal_encoding_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_internal_encoding_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_list_encodings.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_list_encodings.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_output_handler_euc_jp.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_output_handler_euc_jp.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_preferred_mime_name.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_preferred_mime_name.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_regex_encoding_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_regex_encoding_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_split-compat-01.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_split-compat-01.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strcut_missing_boundary_check.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strcut_missing_boundary_check.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stripos_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stripos_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stripos_basic2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stripos_basic2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stristr_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stristr_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stristr_variation5.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_stristr_variation5.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strlen_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strlen_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strlen_variation3.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strlen_variation3.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strpos_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strpos_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrchr_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrchr_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrchr_variation5.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrchr_variation5.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrchr_variation6.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrchr_variation6.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrichr_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrichr_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrichr_variation5.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrichr_variation5.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strripos_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strripos_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strripos_basic2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strripos_basic2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrpos_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrpos_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrpos_variation5.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strrpos_variation5.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strstr_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strstr_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strstr_variation5.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strstr_variation5.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strstr_variation6.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strstr_variation6.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtolower_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtolower_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtolower_variation3.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtolower_variation3.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtolower_variation4.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtolower_variation4.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtoupper_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtoupper_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation3.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation3.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation4.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation4.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strwidth.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_strwidth.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substitute_character.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substitute_character.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substitute_character_variation2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substitute_character_variation2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_count_basic.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_count_basic.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_count_variation4.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_count_variation4.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_error1.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_error1.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_error2.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_error2.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_variation3.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_variation3.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_variation4.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_variation4.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_variation5.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_variation5.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_variation6.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_variation6.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_variation7.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/mb_substr_variation7.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/zend_multibyte-10.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/zend_multibyte-10.php.expectf
 create mode 100644 hphp/test/zend/good/ext-mbstring/zend_multibyte-11.php
 create mode 100644 hphp/test/zend/good/ext-mbstring/zend_multibyte-11.php.expectf

diff --git a/hphp/test/zend/bad/ext-mbstring/bug20087.php b/hphp/test/zend/bad/ext-mbstring/bug20087.php
new file mode 100644
index 000000000..1caf54ca6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug20087.php
@@ -0,0 +1,9 @@
+<?php
+ini_set('include_path', dirname(__FILE__));
+include_once('common.inc');
+$testmoo = "blah blah";
+var_dump(mb_parse_str("testmoo"));
+var_dump($testmoo);
+var_dump(mb_parse_str("test=moo"));
+var_dump($test);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug20087.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug20087.php.expectf
new file mode 100644
index 000000000..cf443d4c2
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug20087.php.expectf
@@ -0,0 +1,4 @@
+bool(true)
+string(0) ""
+bool(true)
+string(3) "moo"
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug26639.php b/hphp/test/zend/bad/ext-mbstring/bug26639.php
new file mode 100644
index 000000000..d8bb8931f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug26639.php
@@ -0,0 +1,67 @@
+<?php
+$a = "����������";
+$b = $a;
+mb_convert_variables("EUC-JP", "Shift_JIS", $b);
+debug_zval_dump($a);
+debug_zval_dump($b);
+unset($a);
+unset($b);
+
+$a = "����������";
+$b = &$a;
+mb_convert_variables("EUC-JP", "Shift_JIS", $b);
+debug_zval_dump($a);
+debug_zval_dump($b);
+unset($a);
+unset($b);
+
+$a = "����������";
+$b = array($a);
+$c = $b;
+mb_convert_variables("EUC-JP", "Shift_JIS", $c);
+debug_zval_dump($b);
+debug_zval_dump($c);
+unset($a);
+unset($b);
+unset($c);
+
+$a = "����������";
+$b = array(&$a);
+$c = $b;
+mb_convert_variables("EUC-JP", "Shift_JIS", $c);
+debug_zval_dump($b);
+debug_zval_dump($c);
+unset($a);
+unset($b);
+unset($c);
+
+$a = "����������";
+$b = array($a);
+$c = &$b;
+mb_convert_variables("EUC-JP", "Shift_JIS", $c);
+debug_zval_dump($b);
+debug_zval_dump($c);
+unset($a);
+unset($b);
+unset($c);
+
+$a = "����������";
+$b = array(&$a);
+$c = &$b;
+mb_convert_variables("EUC-JP", "Shift_JIS", $c);
+debug_zval_dump($b);
+debug_zval_dump($c);
+unset($a);
+unset($b);
+unset($c);
+
+$a = array(array("����������"));
+$b = $a;
+$c = $b;
+mb_convert_variables("EUC-JP", "Shift_JIS", $c);
+debug_zval_dump($b);
+debug_zval_dump($c);
+unset($a);
+unset($b);
+unset($c);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug26639.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug26639.php.expectf
new file mode 100644
index 000000000..eec8fb062
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug26639.php.expectf
@@ -0,0 +1,50 @@
+string(10) "����������" refcount(2)
+string(10) "あいうえお" refcount(2)
+string(10) "あいうえお" refcount(1)
+string(10) "あいうえお" refcount(1)
+array(1) refcount(2){
+  [0]=>
+  string(10) "����������" refcount(2)
+}
+array(1) refcount(2){
+  [0]=>
+  string(10) "あいうえお" refcount(1)
+}
+array(1) refcount(2){
+  [0]=>
+  &string(10) "����������" refcount(2)
+}
+array(1) refcount(2){
+  [0]=>
+  string(10) "あいうえお" refcount(1)
+}
+array(1) refcount(1){
+  [0]=>
+  string(10) "あいうえお" refcount(2)
+}
+array(1) refcount(1){
+  [0]=>
+  string(10) "あいうえお" refcount(2)
+}
+array(1) refcount(1){
+  [0]=>
+  string(10) "あいうえお" refcount(2)
+}
+array(1) refcount(1){
+  [0]=>
+  string(10) "あいうえお" refcount(2)
+}
+array(1) refcount(3){
+  [0]=>
+  array(1) refcount(1){
+    [0]=>
+    string(10) "����������" refcount(1)
+  }
+}
+array(1) refcount(2){
+  [0]=>
+  array(1) refcount(1){
+    [0]=>
+    string(10) "あいうえお" refcount(1)
+  }
+}
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug28220.php b/hphp/test/zend/bad/ext-mbstring/bug28220.php
new file mode 100644
index 000000000..73f7f68e6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug28220.php
@@ -0,0 +1,17 @@
+<?php
+$coderange = array(
+	range(0x0000, 0x1fff),
+	range(0xff60, 0xff9f)
+);
+
+
+foreach ($coderange as $r) {
+	$ng = 0;
+	foreach ($r as $c) {
+		if (mb_strwidth(pack('N1', $c), 'UCS-4BE') != 2) {
+			$ng++;
+		}
+	}
+	echo "$ng\n";
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug28220.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug28220.php.expectf
new file mode 100644
index 000000000..1417b70a6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug28220.php.expectf
@@ -0,0 +1,2 @@
+8085
+63
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug40685.php b/hphp/test/zend/bad/ext-mbstring/bug40685.php
new file mode 100644
index 000000000..dfac651d8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug40685.php
@@ -0,0 +1,11 @@
+<?php
+$map = array(0, 0x10FFFF, 0, 0xFFFFFF);
+var_dump(mb_decode_numericentity('&', $map, 'UTF-8'));
+var_dump(mb_decode_numericentity('&&&', $map, 'UTF-8'));
+var_dump(mb_decode_numericentity('&#', $map, 'UTF-8'));
+var_dump(mb_decode_numericentity('&#x', $map, 'UTF-8'));
+var_dump(mb_decode_numericentity('&#61', $map, 'UTF-8'));
+var_dump(mb_decode_numericentity('&#x3d', $map, 'UTF-8'));
+var_dump(mb_decode_numericentity('&#61;', $map, 'UTF-8'));
+var_dump(mb_decode_numericentity('&#x3d;', $map, 'UTF-8'));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug40685.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug40685.php.expectf
new file mode 100644
index 000000000..b30d8e012
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug40685.php.expectf
@@ -0,0 +1,8 @@
+string(1) "&"
+string(3) "&&&"
+string(2) "&#"
+string(3) "&#x"
+string(4) "&#61"
+string(5) "&#x3D"
+string(1) "="
+string(1) "="
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug43301.php b/hphp/test/zend/bad/ext-mbstring/bug43301.php
new file mode 100644
index 000000000..904b92846
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug43301.php
@@ -0,0 +1,11 @@
+<?php
+
+$ptr = 'hello';
+
+$txt = <<<doc
+hello, I have got a cr*sh on you
+doc;
+
+echo mb_ereg_replace($ptr,'$1',$txt,'e');
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug43301.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug43301.php.expectf
new file mode 100644
index 000000000..76cc23126
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug43301.php.expectf
@@ -0,0 +1,3 @@
+Parse error: syntax error, unexpected %s, expecting %s or '$' in %sbug43301.php(%d) : mbregex replace on line %d
+HipHop Fatal error: %a
+$1 in %sbug43301.php on line %d
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug43840.php b/hphp/test/zend/bad/ext-mbstring/bug43840.php
new file mode 100644
index 000000000..148f49d6d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug43840.php
@@ -0,0 +1,25 @@
+<?php
+/* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * mb_strpos bounds check is byte count rather than a character count:
+ * The multibyte string should be returning the same results as the ASCII string.
+ * Multibyte string was not returning error message until offset was passed the
+ * byte count of the string. Should return error message when passed character count.
+ */
+
+$offsets = array(20, 21, 22, 53, 54);
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+$needle = base64_decode('44CC');
+
+foreach($offsets as $i) {
+	echo "\n-- Offset is $i --\n";
+	echo "--Multibyte String:--\n";
+	var_dump( mb_strpos($string_mb, $needle, $i, 'UTF-8') );
+	echo"--ASCII String:--\n";
+	var_dump(mb_strpos(b'This is na English ta', b'a', $i));
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug43840.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug43840.php.expectf
new file mode 100644
index 000000000..b2b4cb6fc
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug43840.php.expectf
@@ -0,0 +1,35 @@
+-- Offset is 20 --
+--Multibyte String:--
+int(20)
+--ASCII String:--
+int(20)
+
+-- Offset is 21 --
+--Multibyte String:--
+bool(false)
+--ASCII String:--
+bool(false)
+
+-- Offset is 22 --
+--Multibyte String:--
+HipHop Warning: %a
+bool(false)
+--ASCII String:--
+HipHop Warning: %a
+bool(false)
+
+-- Offset is 53 --
+--Multibyte String:--
+HipHop Warning: %a
+bool(false)
+--ASCII String:--
+HipHop Warning: %a
+bool(false)
+
+-- Offset is 54 --
+--Multibyte String:--
+HipHop Warning: %a
+bool(false)
+--ASCII String:--
+HipHop Warning: %a
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug43841.php b/hphp/test/zend/bad/ext-mbstring/bug43841.php
new file mode 100644
index 000000000..c04bc687d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug43841.php
@@ -0,0 +1,27 @@
+<?php
+/* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of last occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test that mb_strrpos offset is byte count for negative values (should be character count)
+ */
+
+$offsets = array(-25, -24, -13, -12);
+$string_mb =
+base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvv
+JfvvJjvvJnjgII=');
+$needle = base64_decode('44CC');
+
+foreach ($offsets as $i) {
+	echo "\n-- Offset is $i --\n";
+	echo "Multibyte String:\n";
+	var_dump( mb_strrpos($string_mb, $needle, $i, 'UTF-8') );
+	echo "ASCII String:\n";
+	echo "mb_strrpos:\n";
+	var_dump(mb_strrpos(b'This is na English ta', b'a', $i));
+	echo "strrpos:\n";
+	var_dump(strrpos(b'This is na English ta', b'a', $i));
+}
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/bug43841.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug43841.php.expectf
new file mode 100644
index 000000000..db180a39a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug43841.php.expectf
@@ -0,0 +1,41 @@
+-- Offset is -25 --
+Multibyte String:
+HipHop Warning: %a
+bool(false)
+ASCII String:
+mb_strrpos:
+HipHop Warning: %a
+bool(false)
+strrpos:
+HipHop Warning: %a
+bool(false)
+
+-- Offset is -24 --
+Multibyte String:
+HipHop Warning: %a
+bool(false)
+ASCII String:
+mb_strrpos:
+HipHop Warning: %a
+bool(false)
+strrpos:
+HipHop Warning: %a
+bool(false)
+
+-- Offset is -13 --
+Multibyte String:
+bool(false)
+ASCII String:
+mb_strrpos:
+bool(false)
+strrpos:
+bool(false)
+
+-- Offset is -12 --
+Multibyte String:
+int(9)
+ASCII String:
+mb_strrpos:
+int(9)
+strrpos:
+int(9)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug43994.php b/hphp/test/zend/bad/ext-mbstring/bug43994.php
new file mode 100644
index 000000000..301f6a3e8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug43994.php
@@ -0,0 +1,31 @@
+<?php
+/* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * mb_ereg 'successfully' matching incorrectly: 
+ * Bug now seems to be fixed - error message is now generated when an 'empty'
+ * pattern is supplied to mb_ereg. Similar error message to ereg().
+ */
+
+$unset_var = 10;
+unset ($unset_var);
+$inputs = array(NULL, null, false, FALSE, "", '', @$undefined_var,
+@$unset_var);
+
+$iterator = 1;
+foreach($inputs as $input) {
+	if(@is_array($mb_regs)){
+		$mb_regs = '';
+	}
+	echo "\n-- Iteration $iterator --\n";
+	echo "Without \$regs arg:\n";
+	var_dump( mb_ereg($input, 'hello, world') );
+	echo "With \$regs arg:\n";
+	var_dump(mb_ereg($input, 'hello, world', $mb_regs));
+	var_dump($mb_regs);
+	$iterator++;
+};
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/bug43994.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug43994.php.expectf
new file mode 100644
index 000000000..511fd8f7c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug43994.php.expectf
@@ -0,0 +1,71 @@
+-- Iteration 1 --
+Without $regs arg:
+HipHop Warning: %a
+bool(false)
+With $regs arg:
+HipHop Warning: %a
+bool(false)
+NULL
+
+-- Iteration 2 --
+Without $regs arg:
+HipHop Warning: %a
+bool(false)
+With $regs arg:
+HipHop Warning: %a
+bool(false)
+NULL
+
+-- Iteration 3 --
+Without $regs arg:
+HipHop Warning: %a
+bool(false)
+With $regs arg:
+HipHop Warning: %a
+bool(false)
+NULL
+
+-- Iteration 4 --
+Without $regs arg:
+HipHop Warning: %a
+bool(false)
+With $regs arg:
+HipHop Warning: %a
+bool(false)
+NULL
+
+-- Iteration 5 --
+Without $regs arg:
+HipHop Warning: %a
+bool(false)
+With $regs arg:
+HipHop Warning: %a
+bool(false)
+NULL
+
+-- Iteration 6 --
+Without $regs arg:
+HipHop Warning: %a
+bool(false)
+With $regs arg:
+HipHop Warning: %a
+bool(false)
+NULL
+
+-- Iteration 7 --
+Without $regs arg:
+HipHop Warning: %a
+bool(false)
+With $regs arg:
+HipHop Warning: %a
+bool(false)
+NULL
+
+-- Iteration 8 --
+Without $regs arg:
+HipHop Warning: %a
+bool(false)
+With $regs arg:
+HipHop Warning: %a
+bool(false)
+NULL
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug43998.php b/hphp/test/zend/bad/ext-mbstring/bug43998.php
new file mode 100644
index 000000000..7894c22a1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug43998.php
@@ -0,0 +1,22 @@
+<?php
+/* Prototype  : string mb_strto[lower|upper](string $sourcestring [, string $encoding])
+ * Description: Returns a [lower|upper]cased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Two error messages returned for incorrect encoding for mb_strto[upper|lower]
+ * Bug now appears to be fixed
+ */
+
+$sourcestring = 'Hello, World';
+
+$inputs = array(12345, 12.3456789000E-10, true, false, "");
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strtolower($sourcestring, $input) );
+  var_dump( mb_strtoupper($sourcestring, $input) );
+  $iterator++;
+};
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug43998.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug43998.php.expectf
new file mode 100644
index 000000000..ec68488c6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug43998.php.expectf
@@ -0,0 +1,29 @@
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+HipHop Warning: %a
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug48697.php b/hphp/test/zend/bad/ext-mbstring/bug48697.php
new file mode 100644
index 000000000..1867652d0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug48697.php
@@ -0,0 +1,13 @@
+<?php
+ini_set('mbstring.internal_encoding', 'ISO-8859-15');
+ini_set('mbstring.encoding_translation', true);
+var_dump(mb_internal_encoding());
+mb_internal_encoding('UTF-8');
+var_dump(mb_internal_encoding());
+parse_str('a=b');
+var_dump(mb_internal_encoding());
+mb_internal_encoding('UTF-8');
+var_dump(mb_internal_encoding());
+parse_str('a=b');
+var_dump(mb_internal_encoding());
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug48697.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug48697.php.expectf
new file mode 100644
index 000000000..eb8c5cbb1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug48697.php.expectf
@@ -0,0 +1,5 @@
+string(11) "ISO-8859-15"
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-8"
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug49536.php b/hphp/test/zend/bad/ext-mbstring/bug49536.php
new file mode 100644
index 000000000..ff43c27b9
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug49536.php
@@ -0,0 +1,10 @@
+<?php
+// non-strict mode
+var_dump(mb_detect_encoding("A\x81", "SJIS", false));
+// strict mode
+var_dump(mb_detect_encoding("A\x81", "SJIS", true));
+// non-strict mode
+var_dump(mb_detect_encoding("\xc0\x00", "UTF-8", false));
+// strict mode
+var_dump(mb_detect_encoding("\xc0\x00", "UTF-8", true));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug49536.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug49536.php.expectf
new file mode 100644
index 000000000..0ae8528ed
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug49536.php.expectf
@@ -0,0 +1,4 @@
+string(4) "SJIS"
+bool(false)
+bool(false)
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug52981.php b/hphp/test/zend/bad/ext-mbstring/bug52981.php
new file mode 100644
index 000000000..a9cf166ed
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug52981.php
@@ -0,0 +1,14 @@
+<?php
+function test($str)
+{
+	$upper = mb_strtoupper($str, 'UTF-8');
+	$len = strlen($upper);
+	for ($i = 0; $i < $len; ++$i) echo dechex(ord($upper[$i])) . ' ';
+	echo "\n";
+}
+
+// OK
+test("\xF0\x90\x90\xB8");// U+10438 DESERET SMALL LETTER H (added in 3.1.0, March 2001)
+// not OK
+test("\xE2\xB0\xB0");	// U+2C30 GLAGOLITIC SMALL LETTER AZU (added in 4.1.0, March 2005)
+test("\xD4\xA5");		// U+0525 CYRILLIC SMALL LETTER PE WITH DESCENDER (added in 5.2.0, October 2009)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/bug52981.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug52981.php.expectf
new file mode 100644
index 000000000..f383f0796
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/bug52981.php.expectf
@@ -0,0 +1,3 @@
+f0 90 90 90 
+e2 b0 80 
+d4 a4
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/illformed_utf_sequences.php b/hphp/test/zend/bad/ext-mbstring/illformed_utf_sequences.php
new file mode 100644
index 000000000..6ef6d5cd7
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/illformed_utf_sequences.php
@@ -0,0 +1,151 @@
+<?php
+function chk_enc($str, $n, $enc = "UTF-8", $with_bom = false) {
+	$src = bin2hex(mb_convert_encoding($str, "UCS-4BE", $enc));
+	$dst = str_repeat("0000fffd", $n);
+	if ($with_bom) {
+		$dst = "0000feff" . $dst;
+	}
+	if ($dst == $src) {
+		return false;
+	} else {
+		return $src;
+	}
+}
+
+mb_substitute_character(0xfffd);
+
+
+echo "UTF-8 redundancy\n";
+var_dump(chk_enc("\x31\x32\x33", 0));
+var_dump(chk_enc("\x41\x42\x43", 0));
+var_dump(chk_enc("\xc0\xb1\xc0\xb2\xc0\xb3", 6));
+var_dump(chk_enc("\xc1\x81\xc1\x82\xc1\x83", 6));
+var_dump(chk_enc("\xe0\x80\xb1\xe0\x80\xb2\xe0\x80\xb3", 6));
+var_dump(chk_enc("\xe0\x81\x81\xe0\x81\x82\xe0\x81\x83", 6));
+var_dump(chk_enc("\xf0\x80\x80\xb1\xf0\x80\x80\xb2\xf0\x80\x80\xb3", 9));
+var_dump(chk_enc("\xf0\x80\x81\x81\xf0\x80\x81\x82\xf0\x81\x83", 8));
+var_dump(chk_enc("\xf8\x80\x80\x80\xb1\xf8\x80\x80\x80\xb2\xf8\x80\x80\x80\xb3", 15));
+var_dump(chk_enc("\xf8\x80\x80\x81\x81\xf8\x80\x80\x81\x82\xf8\x80\x80\x81\x83", 15));
+var_dump(chk_enc("\xfc\x80\x80\x80\x80\xb1\xfc\x80\x80\x80\x80\xb2\xfc\x80\x80\x80\x80\xb3", 18));
+var_dump(chk_enc("\xfc\x80\x80\x80\x81\x81\xfc\x80\x80\x80\x81\x82\xfc\x80\x80\x80\x81\x83", 18));
+
+var_dump(chk_enc("\xc2\xa2\xc2\xa3\xc2\xa5", 0));
+var_dump(chk_enc("\xe0\x82\xa2\xe0\x82\xa3\xe0\x82\xa5", 6));
+var_dump(chk_enc("\xf0\x80\x82\xa2\xf0\x80\x82\xa3\xf0\x80\x82\xa5", 9));
+var_dump(chk_enc("\xf8\x80\x80\x82\xa2\xf8\x80\x80\x82\xa3\xf8\x80\x80\x82\xa5", 15));
+var_dump(chk_enc("\xfc\x80\x80\x80\x82\xa2\xfc\x80\x80\x80\x82\xa3\xfc\x80\x80\x80\x82\xa5", 18));
+
+var_dump(chk_enc("\xc1\xbf", 2));
+var_dump(chk_enc("\xc2\x80", 0));
+var_dump(chk_enc("\xdf\xbf", 0));
+var_dump(chk_enc("\xe0\x9f\xff", 2));
+var_dump(chk_enc("\xe0\xa0\x80", 2));
+var_dump(chk_enc("\xef\xbf\xbf", 0));
+var_dump(chk_enc("\xf0\x8f\xbf\xbf", 3));
+var_dump(chk_enc("\xf0\x90\x80\x80", 0));
+var_dump(chk_enc("\xf7\xbf\xbf\xbf", 4));
+var_dump(chk_enc("\xf8\x87\xbf\xbf\xbf", 5));
+var_dump(chk_enc("\xf8\x88\x80\x80\x80", 5));
+var_dump(chk_enc("\xfb\xbf\xbf\xbf\xbf", 5));
+var_dump(chk_enc("\xfc\x83\xbf\xbf\xbf\xbf", 6));
+var_dump(chk_enc("\xfc\x84\x80\x80\x80\x80", 6));
+var_dump(chk_enc("\xfd\xaf\xbf\xbf\xbf\xbf", 6));
+var_dump(chk_enc("\xfd\xbf\xbf\xbf\xbf\xbf", 6));
+
+echo "UTF-8 and surrogates area\n";
+$out = '';
+$cnt = 0;
+for ($i = 0xd7ff; $i <= 0xe000; ++$i) {
+	$s = chk_enc(pack('C3', 0xe0 | ($i >> 12), 0x80 | ($i >> 6) & 0x3f, 0x80 | $i & 0x3f), 2);
+	if ($s === false) {
+		$cnt++;
+	} else {
+		$out .= $s;
+	}
+}
+var_dump($cnt);
+var_dump($out);
+
+echo "UTF-32 code range\n";
+var_dump(chk_enc("\x00\x11\x00\x00", 1, "UTF-32BE"));
+var_dump(chk_enc("\x00\x10\xff\xff", 0, "UTF-32BE"));
+var_dump(chk_enc("\x00\x00\x11\x00", 1, "UTF-32LE"));
+var_dump(chk_enc("\xff\xff\x10\x00", 0, "UTF-32LE"));
+var_dump(chk_enc("\x00\x11\x00\x00", 1, "UTF-32"));
+var_dump(chk_enc("\x00\x10\xff\xff", 0, "UTF-32"));
+var_dump(chk_enc("\x00\x00\xfe\xff\x00\x11\x00\x00", 0, "UTF-32"));
+var_dump(chk_enc("\x00\x00\xfe\xff\x00\x10\xff\xff", 0, "UTF-32"));
+var_dump(chk_enc("\xff\xfe\x00\x00\x00\x00\x11\x00", 0, "UTF-32"));
+var_dump(chk_enc("\xff\xfe\x00\x00\xff\xff\x10\x00", 0, "UTF-32"));
+
+echo "UTF-32 and surrogates area\n";
+$out = '';
+$cnt = 0;
+for ($i = 0xd7ff; $i <= 0xe000; ++$i) {
+    $s = chk_enc(pack('C4', $i >> 24, ($i >> 16) & 0xff, ($i >> 8) & 0xff, $i & 0xff), 1, "UTF-32BE");
+	if ($s === false) {
+		$cnt++;
+	} else {
+		$out .= $s;
+	}
+}
+var_dump($cnt);
+var_dump($out);
+
+$out = '';
+$cnt = 0;
+for ($i = 0xd7ff; $i <= 0xe000; ++$i) {
+    $s = chk_enc(pack('C4', $i & 0xff, ($i >> 8) & 0xff, ($i >> 16) & 0xff, ($i >> 24) & 0xff), 1, "UTF-32LE");
+	if ($s === false) {
+		$cnt++;
+	} else {
+		$out .= $s;
+	}
+}
+var_dump($cnt);
+var_dump($out);
+
+$out = '';
+$cnt = 0;
+for ($i = 0xd7ff; $i <= 0xe000; ++$i) {
+    $s = chk_enc(pack('C4', $i >> 24, ($i >> 16) & 0xff, ($i >> 8) & 0xff, $i & 0xff), 1, "UTF-32");
+	if ($s === false) {
+		$cnt++;
+	} else {
+		$out .= $s;
+	}
+}
+var_dump($cnt);
+var_dump($out);
+
+echo "UTF-32 and surrogates area with BOM\n";
+
+$out = '';
+$cnt = 0;
+for ($i = 0xd7ff; $i <= 0xe000; ++$i) {
+    $s = chk_enc("\x00\x00\xfe\xff". pack('C4', $i >> 24, ($i >> 16) & 0xff, ($i >> 8) & 0xff, $i & 0xff), 
+				 1, "UTF-32", true);
+	if ($s === false) {
+		$cnt++;
+	} else {
+		$out .= $s;
+	}
+}
+var_dump($cnt);
+var_dump(str_replace("0000feff","",$out));
+
+$out = '';
+$cnt = 0;
+for ($i = 0xd7ff; $i <= 0xe000; ++$i) {
+    $s = chk_enc("\xff\xfe\x00\x00". pack('C4', $i & 0xff, ($i >> 8) & 0xff, ($i >> 16) & 0xff, ($i >> 24) & 0xff), 
+				 1, "UTF-32", true);
+	if ($s === false) {
+		$cnt++;
+	} else {
+		$out .= $s;
+	}
+}
+var_dump($cnt);
+var_dump(str_replace("0000feff","",$out));
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/illformed_utf_sequences.php.expectf b/hphp/test/zend/bad/ext-mbstring/illformed_utf_sequences.php.expectf
new file mode 100644
index 000000000..9ac25280e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/illformed_utf_sequences.php.expectf
@@ -0,0 +1,60 @@
+UTF-8 redundancy
+string(24) "000000310000003200000033"
+string(24) "000000410000004200000043"
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+string(24) "000000a2000000a3000000a5"
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+string(8) "00000080"
+string(8) "000007ff"
+bool(false)
+string(8) "00000800"
+string(8) "0000ffff"
+bool(false)
+string(8) "00010000"
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+UTF-8 and surrogates area
+int(2048)
+string(16) "0000d7ff0000e000"
+UTF-32 code range
+bool(false)
+string(8) "0010ffff"
+bool(false)
+string(8) "0010ffff"
+bool(false)
+string(8) "0010ffff"
+string(16) "0000feff0000fffd"
+string(16) "0000feff0010ffff"
+string(16) "0000feff0000fffd"
+string(16) "0000feff0010ffff"
+UTF-32 and surrogates area
+int(2048)
+string(16) "0000d7ff0000e000"
+int(2048)
+string(16) "0000d7ff0000e000"
+int(2048)
+string(16) "0000d7ff0000e000"
+UTF-32 and surrogates area with BOM
+int(2048)
+string(16) "0000d7ff0000e000"
+int(2048)
+string(16) "0000d7ff0000e000"
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_decode_mimeheader_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_decode_mimeheader_variation1.php
new file mode 100644
index 000000000..abb963e35
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_decode_mimeheader_variation1.php
@@ -0,0 +1,109 @@
+<?php
+/* Prototype  : string mb_decode_mimeheader(string string)
+ * Description: Decodes the MIME "encoded-word" in the string 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_decode_mimeheader() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for string
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_decode_mimeheader($value) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_decode_mimeheader_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_decode_mimeheader_variation1.php.expectf
new file mode 100644
index 000000000..6acceb9de
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_decode_mimeheader_variation1.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mb_decode_mimeheader() : usage variation ***
+
+--int 0--
+string(1) "0"
+
+--int 1--
+string(1) "1"
+
+--int 12345--
+string(5) "12345"
+
+--int -12345--
+string(5) "-2345"
+
+--float 10.5--
+string(4) "10.5"
+
+--float -10.5--
+string(5) "-10.5"
+
+--float 12.3456789000e10--
+string(12) "123456789000"
+
+--float -12.3456789000e10--
+string(13) "-123456789000"
+
+--float .5--
+string(3) "0.5"
+
+--empty array--
+Error: 2 - mb_decode_mimeheader() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--int indexed array--
+Error: 2 - mb_decode_mimeheader() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--associative array--
+Error: 2 - mb_decode_mimeheader() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--nested arrays--
+Error: 2 - mb_decode_mimeheader() expects parameter 1 to be string, array given, %s(%d)
+NULL
+
+--uppercase NULL--
+string(0) ""
+
+--lowercase null--
+string(0) ""
+
+--lowercase true--
+string(1) "1"
+
+--lowercase false--
+string(0) ""
+
+--uppercase TRUE--
+string(1) "1"
+
+--uppercase FALSE--
+string(0) ""
+
+--empty string DQ--
+string(0) ""
+
+--empty string SQ--
+string(0) ""
+
+--instance of classWithToString--
+string(14) "Class A object"
+
+--instance of classWithoutToString--
+Error: 2 - mb_decode_mimeheader() expects parameter 1 to be string, object given, %s(%d)
+NULL
+
+--undefined var--
+string(0) ""
+
+--unset var--
+string(0) ""
+
+--resource--
+Error: 2 - mb_decode_mimeheader() expects parameter 1 to be string, resource given, %s(%d)
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php
new file mode 100644
index 000000000..4a5e4a312
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php
@@ -0,0 +1,39 @@
+<?php
+/* Prototype  : string mb_encode_mimeheader
+ * (string $str [, string $charset [, string $transfer-encoding [, string $linefeed [, int $indent]]]])
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test basic functionality of mb_encode_mimeheader with different strings.
+ * For the below strings:
+ * 'English' is ASCII only, 'Japanese' has no ASCII characters and 'Greek' is mixed.
+ */
+
+echo "*** Testing mb_encode_mimeheader() : basic ***\n";
+
+$english = array('English' => 'This is an English string. 0123456789');
+$nonEnglish = array('Japanese' => base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC'),
+                'Greek' => base64_decode('zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg=='));
+
+foreach ($english as $lang => $input) {
+	echo "\nLanguage: $lang\n";
+	echo "-- Base 64: --\n";
+	var_dump(mb_encode_mimeheader($input, 'UTF-8', 'B'));
+	echo "-- Quoted-Printable --\n";
+	var_dump(mb_encode_mimeheader($input, 'UTF-8', 'Q'));
+}
+
+mb_internal_encoding('utf-8');
+
+foreach ($nonEnglish as $lang => $input) {
+	echo "\nLanguage: $lang\n";
+	echo "-- Base 64: --\n";
+	var_dump(mb_encode_mimeheader($input, 'UTF-8', 'B'));
+	echo "-- Quoted-Printable --\n";
+	var_dump(mb_encode_mimeheader($input, 'UTF-8', 'Q'));
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php.expectf
new file mode 100644
index 000000000..78cce7f50
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php.expectf
@@ -0,0 +1,25 @@
+*** Testing mb_encode_mimeheader() : basic ***
+
+Language: English
+-- Base 64: --
+string(37) "This is an English string. 0123456789"
+-- Quoted-Printable --
+string(37) "This is an English string. 0123456789"
+
+Language: Japanese
+-- Base 64: --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+-- Quoted-Printable --
+string(117) "=?UTF-8?Q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?=
+ =?UTF-8?Q?=E3=81=A7=E3=81=99=E3=80=82?="
+
+Language: Greek
+-- Base 64: --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+-- Quoted-Printable --
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php
new file mode 100644
index 000000000..7ce81f117
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php
@@ -0,0 +1,34 @@
+<?php
+/* Prototype  : string mb_encode_mimeheader(string $str [, string $charset 
+ * [, string $transfer-encoding [, string $linefeed [, int $indent]]]])
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test mb_encode_header() with different strings
+ */
+
+echo "*** Testing mb_encode_mimeheader() : basic2 ***\n";
+
+//All strings are the same when displayed in their respective encodings
+$sjis_string = base64_decode('k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==');
+$jis_string = base64_decode('GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==');
+$euc_jp_string = base64_decode('xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==');
+
+$inputs = array('SJIS' => $sjis_string,
+                'JIS' => $jis_string,
+                'EUC_JP' => $euc_jp_string);
+
+foreach ($inputs as $lang => $input) {
+	echo "\nLanguage: $lang\n";
+	echo "-- Base 64: --\n";
+	mb_internal_encoding($lang);
+	$outEncoding = "UTF-8";
+	var_dump(mb_encode_mimeheader($input, $outEncoding, 'B'));
+	echo "-- Quoted-Printable --\n";
+	var_dump(mb_encode_mimeheader($input, $outEncoding, 'Q'));
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php.expectf
new file mode 100644
index 000000000..5483e3547
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php.expectf
@@ -0,0 +1,29 @@
+*** Testing mb_encode_mimeheader() : basic2 ***
+
+Language: SJIS
+-- Base 64: --
+string(99) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJc=?=
+ =?UTF-8?B?77yY77yZ44CC?="
+-- Quoted-Printable --
+string(201) "=?UTF-8?Q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?=
+ =?UTF-8?Q?=E3=81=A7=E3=81=99=E3=80=82=30=31=32=33=34=EF=BC=95=EF=BC=96?=
+ =?UTF-8?Q?=EF=BC=97=EF=BC=98=EF=BC=99=E3=80=82?="
+
+Language: JIS
+-- Base 64: --
+string(99) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJc=?=
+ =?UTF-8?B?77yY77yZ44CC?="
+-- Quoted-Printable --
+string(201) "=?UTF-8?Q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?=
+ =?UTF-8?Q?=E3=81=A7=E3=81=99=E3=80=82=30=31=32=33=34=EF=BC=95=EF=BC=96?=
+ =?UTF-8?Q?=EF=BC=97=EF=BC=98=EF=BC=99=E3=80=82?="
+
+Language: EUC_JP
+-- Base 64: --
+string(99) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJc=?=
+ =?UTF-8?B?77yY77yZ44CC?="
+-- Quoted-Printable --
+string(201) "=?UTF-8?Q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?=
+ =?UTF-8?Q?=E3=81=A7=E3=81=99=E3=80=82=30=31=32=33=34=EF=BC=95=EF=BC=96?=
+ =?UTF-8?Q?=EF=BC=97=EF=BC=98=EF=BC=99=E3=80=82?="
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php
new file mode 100644
index 000000000..520519371
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php
@@ -0,0 +1,34 @@
+<?php
+/* Prototype  : string mb_encode_mimeheader(string $str [, string $charset 
+ * [, string $transfer-encoding [, string $linefeed [, int $indent]]]])
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test mb_encode_header() with different strings
+ */
+
+echo "*** Testing mb_encode_mimeheader() : basic2 ***\n";
+
+//All strings are the same when displayed in their respective encodings
+$sjis_string = base64_decode('k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==');
+$jis_string = base64_decode('GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==');
+$euc_jp_string = base64_decode('xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==');
+
+$inputs = array('SJIS' => $sjis_string,
+                'JIS' => $jis_string,
+                'EUC_JP' => $euc_jp_string);
+
+foreach ($inputs as $lang => $input) {
+	echo "\nLanguage: $lang\n";
+	echo "-- Base 64: --\n";
+	mb_internal_encoding($lang);
+	$outEncoding = $lang;
+	var_dump(mb_encode_mimeheader($input, $outEncoding, 'B'));
+	echo "-- Quoted-Printable --\n";
+	var_dump(mb_encode_mimeheader($input, $outEncoding, 'Q'));
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php.expectf
new file mode 100644
index 000000000..e7884482d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php.expectf
@@ -0,0 +1,25 @@
+*** Testing mb_encode_mimeheader() : basic2 ***
+
+Language: SJIS
+-- Base 64: --
+string(68) "=?Shift_JIS?B?k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==?="
+-- Quoted-Printable --
+string(124) "=?Shift_JIS?Q?=93=FA=96=7B=8C=EA=83e=83L=83X=83g=82=C5=82=B7=81B=30=31=32?=
+ =?Shift_JIS?Q?=33=34=82T=82U=82V=82W=82X=81B?="
+
+Language: JIS
+-- Base 64: --
+string(115) "=?ISO-2022-JP?B?GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYbKEI=?=
+ =?ISO-2022-JP?B?GyRCIzcjOCM5ISMbKEI=?="
+-- Quoted-Printable --
+string(209) "=?ISO-2022-JP?Q?=1B=24BF=7CK=5C=38l=25F=25-=25=39=25H=24G=24=39=1B=28B?=
+ =?ISO-2022-JP?Q?=1B=24B!=23=1B=28B=30=31=32=33=34=1B=24B=23=35=1B=28B?=
+ =?ISO-2022-JP?Q?=1B=24B=23=36=23=37=23=38=23=39!=23=1B=28B?="
+
+Language: EUC_JP
+-- Base 64: --
+string(65) "=?EUC-JP?B?xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==?="
+-- Quoted-Printable --
+string(140) "=?EUC-JP?Q?=C6=FC=CB=DC=B8=EC=A5=C6=A5=AD=A5=B9=A5=C8=A4=C7=A4=B9=A1=A3?=
+ =?EUC-JP?Q?=30=31=32=33=34=A3=B5=A3=B6=A3=B7=A3=B8=A3=B9=A1=A3?="
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_indent.php b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_indent.php
new file mode 100644
index 000000000..a9032e213
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_indent.php
@@ -0,0 +1,27 @@
+<?php
+/* Prototype  : string mb_encode_mimeheader
+ * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types to $indent argument to see how mb_encode_mimeheader() behaves
+ */
+
+echo "*** Testing mb_encode_mimeheader() : indent ***\n";
+
+mb_internal_encoding('utf-8');
+
+// Initialise function arguments not being substituted
+$str = base64_decode('zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==');
+$charset = 'utf-8';
+$linefeed = "\r\n";
+
+for ($i = 0; $i < 100; $i++) {
+  echo "\n-- Iteration $i --\n";
+  var_dump( mb_encode_mimeheader($str, $charset, "B", $linefeed, $i));
+  var_dump( mb_encode_mimeheader($str, $charset, "Q", $linefeed, $i));  
+};
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_indent.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_indent.php.expectf
new file mode 100644
index 000000000..74d287f4e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_indent.php.expectf
@@ -0,0 +1,863 @@
+*** Testing mb_encode_mimeheader() : indent ***
+
+-- Iteration 0 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 1 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 2 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 3 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 4 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrU=?=
+ =?UTF-8?B?zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9?=
+ =?UTF-8?Q?=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA?=
+ =?UTF-8?Q?=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36?=
+ =?UTF-8?Q?=37=38=39=2E?="
+
+-- Iteration 5 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrU=?=
+ =?UTF-8?B?zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9?=
+ =?UTF-8?Q?=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA?=
+ =?UTF-8?Q?=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36?=
+ =?UTF-8?Q?=37=38=39=2E?="
+
+-- Iteration 6 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrU=?=
+ =?UTF-8?B?zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9?=
+ =?UTF-8?Q?=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA?=
+ =?UTF-8?Q?=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36?=
+ =?UTF-8?Q?=37=38=39=2E?="
+
+-- Iteration 7 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrU=?=
+ =?UTF-8?B?zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1?=
+ =?UTF-8?Q?=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20?=
+ =?UTF-8?Q?=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34?=
+ =?UTF-8?Q?=35=36=37=38=39=2E?="
+
+-- Iteration 8 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66?=
+ =?UTF-8?B?zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1?=
+ =?UTF-8?Q?=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20?=
+ =?UTF-8?Q?=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34?=
+ =?UTF-8?Q?=35=36=37=38=39=2E?="
+
+-- Iteration 9 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66?=
+ =?UTF-8?B?zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1?=
+ =?UTF-8?Q?=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20?=
+ =?UTF-8?Q?=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34?=
+ =?UTF-8?Q?=35=36=37=38=39=2E?="
+
+-- Iteration 10 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66?=
+ =?UTF-8?B?zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1?=
+ =?UTF-8?Q?=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20?=
+ =?UTF-8?Q?=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34?=
+ =?UTF-8?Q?=35=36=37=38=39=2E?="
+
+-- Iteration 11 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66?=
+ =?UTF-8?B?zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1?=
+ =?UTF-8?Q?=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20?=
+ =?UTF-8?Q?=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34?=
+ =?UTF-8?Q?=35=36=37=38=39=2E?="
+
+-- Iteration 12 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+M?=
+ =?UTF-8?B?IM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1?=
+ =?UTF-8?Q?=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20?=
+ =?UTF-8?Q?=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34?=
+ =?UTF-8?Q?=35=36=37=38=39=2E?="
+
+-- Iteration 13 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+M?=
+ =?UTF-8?B?IM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD?=
+ =?UTF-8?Q?=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C?=
+ =?UTF-8?Q?=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33?=
+ =?UTF-8?Q?=34=35=36=37=38=39=2E?="
+
+-- Iteration 14 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+M?=
+ =?UTF-8?B?IM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD?=
+ =?UTF-8?Q?=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C?=
+ =?UTF-8?Q?=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33?=
+ =?UTF-8?Q?=34=35=36=37=38=39=2E?="
+
+-- Iteration 15 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+M?=
+ =?UTF-8?B?IM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD?=
+ =?UTF-8?Q?=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C?=
+ =?UTF-8?Q?=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33?=
+ =?UTF-8?Q?=34=35=36=37=38=39=2E?="
+
+-- Iteration 16 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrk=?=
+ =?UTF-8?B?zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD?=
+ =?UTF-8?Q?=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C?=
+ =?UTF-8?Q?=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33?=
+ =?UTF-8?Q?=34=35=36=37=38=39=2E?="
+
+-- Iteration 17 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrk=?=
+ =?UTF-8?B?zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD?=
+ =?UTF-8?Q?=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C?=
+ =?UTF-8?Q?=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33?=
+ =?UTF-8?Q?=34=35=36=37=38=39=2E?="
+
+-- Iteration 18 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrk=?=
+ =?UTF-8?B?zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD?=
+ =?UTF-8?Q?=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C?=
+ =?UTF-8?Q?=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33?=
+ =?UTF-8?Q?=34=35=36=37=38=39=2E?="
+
+-- Iteration 19 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrk=?=
+ =?UTF-8?B?zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF?=
+ =?UTF-8?Q?=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA?=
+ =?UTF-8?Q?=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31?=
+ =?UTF-8?Q?=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 20 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869?=
+ =?UTF-8?B?zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF?=
+ =?UTF-8?Q?=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA?=
+ =?UTF-8?Q?=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31?=
+ =?UTF-8?Q?=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 21 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869?=
+ =?UTF-8?B?zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF?=
+ =?UTF-8?Q?=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA?=
+ =?UTF-8?Q?=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31?=
+ =?UTF-8?Q?=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 22 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869?=
+ =?UTF-8?B?zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF?=
+ =?UTF-8?Q?=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA?=
+ =?UTF-8?Q?=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31?=
+ =?UTF-8?Q?=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 23 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869?=
+ =?UTF-8?B?zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF?=
+ =?UTF-8?Q?=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA?=
+ =?UTF-8?Q?=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31?=
+ =?UTF-8?Q?=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 24 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrs=?=
+ =?UTF-8?B?zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF?=
+ =?UTF-8?Q?=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA?=
+ =?UTF-8?Q?=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31?=
+ =?UTF-8?Q?=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 25 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrs=?=
+ =?UTF-8?B?zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9?=
+ =?UTF-8?Q?=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20?=
+ =?UTF-8?Q?=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 26 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrs=?=
+ =?UTF-8?B?zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9?=
+ =?UTF-8?Q?=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20?=
+ =?UTF-8?Q?=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 27 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrs=?=
+ =?UTF-8?B?zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9?=
+ =?UTF-8?Q?=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20?=
+ =?UTF-8?Q?=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 28 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67?=
+ =?UTF-8?B?zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9?=
+ =?UTF-8?Q?=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20?=
+ =?UTF-8?Q?=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 29 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67?=
+ =?UTF-8?B?zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9?=
+ =?UTF-8?Q?=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20?=
+ =?UTF-8?Q?=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 30 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67?=
+ =?UTF-8?B?zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9?=
+ =?UTF-8?Q?=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20?=
+ =?UTF-8?Q?=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 31 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67?=
+ =?UTF-8?B?zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20?=
+ =?UTF-8?Q?=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD?=
+ =?UTF-8?Q?=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF?=
+ =?UTF-8?Q?=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 32 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSA=?=
+ =?UTF-8?B?zrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20?=
+ =?UTF-8?Q?=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD?=
+ =?UTF-8?Q?=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF?=
+ =?UTF-8?Q?=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 33 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSA=?=
+ =?UTF-8?B?zrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20?=
+ =?UTF-8?Q?=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD?=
+ =?UTF-8?Q?=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF?=
+ =?UTF-8?Q?=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 34 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSA=?=
+ =?UTF-8?B?zrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20?=
+ =?UTF-8?Q?=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD?=
+ =?UTF-8?Q?=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF?=
+ =?UTF-8?Q?=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 35 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSA=?=
+ =?UTF-8?B?zrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20?=
+ =?UTF-8?Q?=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD?=
+ =?UTF-8?Q?=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF?=
+ =?UTF-8?Q?=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 36 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrE=?=
+ =?UTF-8?B?zrkgzrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4?=
+ =?UTF-8?B?OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20?=
+ =?UTF-8?Q?=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD?=
+ =?UTF-8?Q?=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF?=
+ =?UTF-8?Q?=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 37 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrE=?=
+ =?UTF-8?B?zrkgzrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4?=
+ =?UTF-8?B?OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C?=
+ =?UTF-8?Q?=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7?=
+ =?UTF-8?Q?=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD?=
+ =?UTF-8?Q?=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 38 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrE=?=
+ =?UTF-8?B?zrkgzrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4?=
+ =?UTF-8?B?OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C?=
+ =?UTF-8?Q?=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7?=
+ =?UTF-8?Q?=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD?=
+ =?UTF-8?Q?=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 39 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrE=?=
+ =?UTF-8?B?zrkgzrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEyMzQ1Njc4?=
+ =?UTF-8?B?OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C?=
+ =?UTF-8?Q?=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB=CE=B7?=
+ =?UTF-8?Q?=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5=CE=BD?=
+ =?UTF-8?Q?=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 40 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869?=
+ =?UTF-8?B?zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2?=
+ =?UTF-8?B?Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84?=
+ =?UTF-8?Q?=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB?=
+ =?UTF-8?Q?=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5?=
+ =?UTF-8?Q?=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 41 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869?=
+ =?UTF-8?B?zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2?=
+ =?UTF-8?B?Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84?=
+ =?UTF-8?Q?=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB?=
+ =?UTF-8?Q?=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5?=
+ =?UTF-8?Q?=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 42 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869?=
+ =?UTF-8?B?zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2?=
+ =?UTF-8?B?Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84?=
+ =?UTF-8?Q?=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB?=
+ =?UTF-8?Q?=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5?=
+ =?UTF-8?Q?=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 43 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869?=
+ =?UTF-8?B?zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2?=
+ =?UTF-8?B?Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84?=
+ =?UTF-8?Q?=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB?=
+ =?UTF-8?Q?=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5?=
+ =?UTF-8?Q?=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 44 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrU=?=
+ =?UTF-8?B?zq/Ovc6xzrkgzrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEy?=
+ =?UTF-8?B?MzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84?=
+ =?UTF-8?Q?=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB?=
+ =?UTF-8?Q?=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5?=
+ =?UTF-8?Q?=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 45 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrU=?=
+ =?UTF-8?B?zq/Ovc6xzrkgzrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEy?=
+ =?UTF-8?B?MzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84?=
+ =?UTF-8?Q?=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB=CE=BB?=
+ =?UTF-8?Q?=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC=CE=B5?=
+ =?UTF-8?Q?=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 46 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrU=?=
+ =?UTF-8?B?zq/Ovc6xzrkgzrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEy?=
+ =?UTF-8?B?MzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85?=
+ =?UTF-8?Q?=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB?=
+ =?UTF-8?Q?=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC?=
+ =?UTF-8?Q?=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 47 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wgzrU=?=
+ =?UTF-8?B?zq/Ovc6xzrkgzrXOu867zrfOvc65zrrPjCDOus61zq/OvM61zr3Ovy4gMDEy?=
+ =?UTF-8?B?MzQ1Njc4OS4=?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85?=
+ =?UTF-8?Q?=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB?=
+ =?UTF-8?Q?=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC?=
+ =?UTF-8?Q?=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 48 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wg?=
+ =?UTF-8?B?zrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAw?=
+ =?UTF-8?B?MTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85?=
+ =?UTF-8?Q?=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB?=
+ =?UTF-8?Q?=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC?=
+ =?UTF-8?Q?=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 49 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wg?=
+ =?UTF-8?B?zrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAw?=
+ =?UTF-8?B?MTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85?=
+ =?UTF-8?Q?=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB?=
+ =?UTF-8?Q?=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC?=
+ =?UTF-8?Q?=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 50 --
+string(130) "=?UTF-8?B?zpHPhc+Ez4wg?=
+ =?UTF-8?B?zrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAw?=
+ =?UTF-8?B?MTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85?=
+ =?UTF-8?Q?=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20=CE=B5=CE=BB?=
+ =?UTF-8?Q?=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5=CE=AF=CE=BC?=
+ =?UTF-8?Q?=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38=39=2E?="
+
+-- Iteration 51 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 52 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 53 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 54 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 55 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 56 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 57 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 58 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 59 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 60 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 61 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 62 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 63 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 64 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 65 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 66 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 67 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 68 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 69 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 70 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 71 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 72 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 73 --
+string(118) "
+ =?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(252) "
+ =?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 74 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 75 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 76 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 77 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 78 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 79 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 80 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 81 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 82 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 83 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 84 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 85 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 86 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 87 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 88 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 89 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 90 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 91 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 92 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 93 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 94 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 95 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 96 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 97 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 98 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+
+-- Iteration 99 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+string(249) "=?UTF-8?Q?=CE=91=CF=85=CF=84=CF=8C=20=CE=B5=CE=AF=CE=BD=CE=B1=CE=B9=20?=
+ =?UTF-8?Q?=CE=B5=CE=BB=CE=BB=CE=B7=CE=BD=CE=B9=CE=BA=CF=8C=20=CE=BA=CE=B5?=
+ =?UTF-8?Q?=CE=AF=CE=BC=CE=B5=CE=BD=CE=BF=2E=20=30=31=32=33=34=35=36=37=38?=
+ =?UTF-8?Q?=39=2E?="
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation1.php
new file mode 100644
index 000000000..176de97a8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation1.php
@@ -0,0 +1,99 @@
+<?php
+/* Prototype  : string mb_encode_mimeheader
+ * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types to $str argument to see how mb_encode_mimeheader() behaves
+ */
+
+echo "*** Testing mb_encode_mimeheader() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$charset = 'utf-8';
+$transfer_encoding = 'B';
+$linefeed = "\r\n";
+$indent = 2;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $str argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_encode_mimeheader()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_encode_mimeheader($input, $charset, $transfer_encoding, $linefeed, $indent));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation1.php.expectf
new file mode 100644
index 000000000..d3cec3427
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation1.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_encode_mimeheader() : usage variations ***
+
+-- Iteration 1 --
+string(1) "0"
+
+-- Iteration 2 --
+string(1) "1"
+
+-- Iteration 3 --
+string(5) "12345"
+
+-- Iteration 4 --
+string(5) "-2345"
+
+-- Iteration 5 --
+string(4) "10.5"
+
+-- Iteration 6 --
+string(5) "-10.5"
+
+-- Iteration 7 --
+string(12) "123456789000"
+
+-- Iteration 8 --
+string(13) "1.23456789E-9"
+
+-- Iteration 9 --
+string(3) "0.5"
+
+-- Iteration 10 --
+string(0) ""
+
+-- Iteration 11 --
+string(0) ""
+
+-- Iteration 12 --
+string(1) "1"
+
+-- Iteration 13 --
+string(0) ""
+
+-- Iteration 14 --
+string(1) "1"
+
+-- Iteration 15 --
+string(0) ""
+
+-- Iteration 16 --
+string(0) ""
+
+-- Iteration 17 --
+string(0) ""
+
+-- Iteration 18 --
+string(6) "string"
+
+-- Iteration 19 --
+string(6) "string"
+
+-- Iteration 20 --
+string(11) "hello world"
+
+-- Iteration 21 --
+string(14) "Class A object"
+
+-- Iteration 22 --
+string(0) ""
+
+-- Iteration 23 --
+string(0) ""
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation2.php
new file mode 100644
index 000000000..b4e9953cc
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation2.php
@@ -0,0 +1,101 @@
+<?php
+/* Prototype  : string mb_encode_mimeheader
+ * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types to $charset argument to see how mb_encode_mimeheader() behaves
+ */
+
+echo "*** Testing mb_encode_mimeheader() : usage variations ***\n";
+
+mb_internal_encoding('utf-8');
+
+// Initialise function arguments not being substituted
+$str = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC');
+$transfer_encoding = 'B';
+$linefeed = "\r\n";
+$indent = 2;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+utf-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $charset argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "utf-8",
+       'utf-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_encode_mimeheader()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_encode_mimeheader($str, $input, $transfer_encoding, $linefeed, $indent));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation2.php.expectf
new file mode 100644
index 000000000..60eac11d3
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation2.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_encode_mimeheader() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 19 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 20 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 21 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation3.php
new file mode 100644
index 000000000..d10356375
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation3.php
@@ -0,0 +1,101 @@
+<?php
+/* Prototype  : string mb_encode_mimeheader
+ * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types to $transfer_encoding argument to see how mb_encode_mimeheader() behaves
+ */
+
+echo "*** Testing mb_encode_mimeheader() : usage variations ***\n";
+
+mb_internal_encoding('utf-8');
+
+// Initialise function arguments not being substituted
+$str = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC');
+$charset = 'utf-8';
+$linefeed = "\r\n";
+$indent = 2;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $transfer_encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_encode_mimeheader()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_encode_mimeheader($str, $charset, $input, $linefeed, $indent));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation3.php.expectf
new file mode 100644
index 000000000..f273a603f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation3.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_encode_mimeheader() : usage variations ***
+
+-- Iteration 1 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 2 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 3 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 4 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 5 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 6 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 7 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 8 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 9 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 10 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 11 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 12 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 13 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 14 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 15 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 16 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 17 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 18 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 19 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 20 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 21 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 22 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 23 --
+string(52) "=?UTF-8?B?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation4.php b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation4.php
new file mode 100644
index 000000000..dc26bc592
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation4.php
@@ -0,0 +1,102 @@
+<?php
+/* Prototype  : string mb_encode_mimeheader
+ * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types to $linefeed argument to see how mb_encode_mimeheader() behaves
+ */
+
+echo "*** Testing mb_encode_mimeheader() : usage variations ***\n";
+mb_internal_encoding('utf-8');
+
+
+// Initialise function arguments not being substituted
+//longer $str to go over 1 line
+$str = base64_decode('zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==');
+$charset = 'utf-8';
+$transfer_encoding = 'B';
+$indent = 2;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $linefeed argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_encode_mimeheader()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_encode_mimeheader($str, $charset, $transfer_encoding, $input, $indent));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation4.php.expectf
new file mode 100644
index 000000000..42c58aee1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation4.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_encode_mimeheader() : usage variations ***
+
+-- Iteration 1 --
+string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=0 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 2 --
+string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=1 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 3 --
+string(118) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=12345 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 4 --
+string(118) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=-2345 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 5 --
+string(117) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=10.5 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 6 --
+string(118) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=-10.5 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 7 --
+string(121) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=12345678 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 8 --
+string(121) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=1.234567 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 9 --
+string(116) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=0.5 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 10 --
+string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 11 --
+string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 12 --
+string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=1 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 13 --
+string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 14 --
+string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=1 =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 15 --
+string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 16 --
+string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 17 --
+string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 18 --
+string(119) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=string =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 19 --
+string(119) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=string =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 20 --
+string(121) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=hello wo =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 21 --
+string(121) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=Class A  =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 22 --
+string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 23 --
+string(113) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?= =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation5.php b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation5.php
new file mode 100644
index 000000000..952c97682
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation5.php
@@ -0,0 +1,101 @@
+<?php
+/* Prototype  : string mb_encode_mimeheader
+ * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types to $indent argument to see how mb_encode_mimeheader() behaves
+ */
+
+echo "*** Testing mb_encode_mimeheader() : usage variations ***\n";
+
+mb_internal_encoding('utf-8');
+
+// Initialise function arguments not being substituted
+$str = base64_decode('zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==');
+$charset = 'utf-8';
+$transfer_encoding = 'B';
+$linefeed = "\r\n";
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $indent argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_encode_mimeheader()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_encode_mimeheader($str, $charset, $transfer_encoding, $linefeed, $input));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation5.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation5.php.expectf
new file mode 100644
index 000000000..96c257dda
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation5.php.expectf
@@ -0,0 +1,98 @@
+*** Testing mb_encode_mimeheader() : usage variations ***
+
+-- Iteration 1 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 2 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 3 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 4 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 5 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66?=
+ =?UTF-8?B?zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 6 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 7 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 8 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 9 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 10 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 11 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 12 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 13 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 14 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 15 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 16 --
+HipHop Warning: %a
+NULL
+
+-- Iteration 17 --
+HipHop Warning: %a
+NULL
+
+-- Iteration 18 --
+HipHop Warning: %a
+NULL
+
+-- Iteration 19 --
+HipHop Warning: %a
+NULL
+
+-- Iteration 20 --
+HipHop Warning: %a
+NULL
+
+-- Iteration 21 --
+HipHop Warning: %a
+NULL
+
+-- Iteration 22 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 23 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php
new file mode 100644
index 000000000..dea90ed48
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php
@@ -0,0 +1,30 @@
+<?php
+/* Prototype  : string mb_encode_mimeheader
+ * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different strings to $linefeed argument
+ */
+
+echo "*** Testing mb_encode_mimeheader() : usage variations ***\n";
+
+mb_internal_encoding('utf-8');
+
+$linefeeds = array("\r\n",
+                   "\n",
+                   "---");
+$str = base64_decode('zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==');
+
+$iterator = 1;
+foreach ($linefeeds as $linefeed) {
+	echo "\n-- Iteration $iterator --\n";
+	var_dump(mb_encode_mimeheader($str, 'utf-8', 'B', $linefeed));
+	$iterator++;
+}
+
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php.expectf
new file mode 100644
index 000000000..080161a08
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php.expectf
@@ -0,0 +1,13 @@
+*** Testing mb_encode_mimeheader() : usage variations ***
+
+-- Iteration 1 --
+string(115) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 2 --
+string(114) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=
+ =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+
+-- Iteration 3 --
+string(116) "=?UTF-8?B?zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868?=--- =?UTF-8?B?zrXOvc6/LiAwMTIzNDU2Nzg5Lg==?="
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encoding_aliases.php b/hphp/test/zend/bad/ext-mbstring/mb_encoding_aliases.php
new file mode 100644
index 000000000..b8e6a93b3
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encoding_aliases.php
@@ -0,0 +1,8 @@
+<?php
+mb_encoding_aliases();
+$list = mb_encoding_aliases("ASCII");
+sort($list);
+var_dump($list);
+var_dump(mb_encoding_aliases("7bit"));
+var_dump(mb_encoding_aliases("8bit"));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encoding_aliases.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_encoding_aliases.php.expectf
new file mode 100644
index 000000000..5b6b7dd43
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_encoding_aliases.php.expectf
@@ -0,0 +1,31 @@
+HipHop Warning: %a
+array(11) {
+  [0]=>
+  string(14) "ANSI_X3.4-1968"
+  [1]=>
+  string(14) "ANSI_X3.4-1986"
+  [2]=>
+  string(7) "IBM-367"
+  [3]=>
+  string(6) "IBM367"
+  [4]=>
+  string(9) "ISO646-US"
+  [5]=>
+  string(16) "ISO_646.irv:1991"
+  [6]=>
+  string(8) "US-ASCII"
+  [7]=>
+  string(5) "cp367"
+  [8]=>
+  string(7) "csASCII"
+  [9]=>
+  string(8) "iso-ir-6"
+  [10]=>
+  string(2) "us"
+}
+array(0) {
+}
+array(1) {
+  [0]=>
+  string(6) "binary"
+}
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg1.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg1.php
new file mode 100644
index 000000000..9edcccad3
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg1.php
@@ -0,0 +1,16 @@
+<?php
+
+$a = array(
+	array(1,2,3),
+	array("", "", ""),
+	array(array(), 1, ""),
+	array(1, array(), ""),
+	array(1, "", array()),
+	);
+
+foreach ($a as $args) {
+	var_dump(mb_ereg($args[0], $args[1], $args[2]));
+	var_dump($args);
+}
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg1.php.expectf
new file mode 100644
index 000000000..fcc89ba59
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg1.php.expectf
@@ -0,0 +1,52 @@
+bool(false)
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+HipHop Warning: %a
+bool(false)
+array(3) {
+  [0]=>
+  string(0) ""
+  [1]=>
+  string(0) ""
+  [2]=>
+  string(0) ""
+}
+HipHop Notice: %a
+bool(false)
+array(3) {
+  [0]=>
+  array(0) {
+  }
+  [1]=>
+  int(1)
+  [2]=>
+  string(0) ""
+}
+HipHop Warning: %a
+bool(false)
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  array(0) {
+  }
+  [2]=>
+  string(0) ""
+}
+bool(false)
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  string(0) ""
+  [2]=>
+  array(0) {
+  }
+}
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg2.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg2.php
new file mode 100644
index 000000000..1668b3847
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg2.php
@@ -0,0 +1,14 @@
+<?php
+
+$a = -1; $b = -1; $c = -1; 
+mbereg($a, $b, $c); 
+var_dump($a, $b, $c); 
+
+mberegi($a, $b, $c); 
+var_dump($a, $b, $c); 
+
+mbereg_search_init($a, $b, $c); 
+var_dump($a, $b, $c);
+
+echo "Done\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg2.php.expectf
new file mode 100644
index 000000000..348a0974c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg2.php.expectf
@@ -0,0 +1,20 @@
+int(-1)
+int(-1)
+array(1) {
+  [0]=>
+  string(2) "-1"
+}
+int(-1)
+int(-1)
+array(1) {
+  [0]=>
+  string(2) "-1"
+}
+HipHop Warning: %a
+int(-1)
+int(-1)
+array(1) {
+  [0]=>
+  string(2) "-1"
+}
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg3.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg3.php
new file mode 100644
index 000000000..1668b3847
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg3.php
@@ -0,0 +1,14 @@
+<?php
+
+$a = -1; $b = -1; $c = -1; 
+mbereg($a, $b, $c); 
+var_dump($a, $b, $c); 
+
+mberegi($a, $b, $c); 
+var_dump($a, $b, $c); 
+
+mbereg_search_init($a, $b, $c); 
+var_dump($a, $b, $c);
+
+echo "Done\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg3.php.expectf
new file mode 100644
index 000000000..348a0974c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg3.php.expectf
@@ -0,0 +1,20 @@
+int(-1)
+int(-1)
+array(1) {
+  [0]=>
+  string(2) "-1"
+}
+int(-1)
+int(-1)
+array(1) {
+  [0]=>
+  string(2) "-1"
+}
+HipHop Warning: %a
+int(-1)
+int(-1)
+array(1) {
+  [0]=>
+  string(2) "-1"
+}
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg4.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg4.php
new file mode 100644
index 000000000..1668b3847
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg4.php
@@ -0,0 +1,14 @@
+<?php
+
+$a = -1; $b = -1; $c = -1; 
+mbereg($a, $b, $c); 
+var_dump($a, $b, $c); 
+
+mberegi($a, $b, $c); 
+var_dump($a, $b, $c); 
+
+mbereg_search_init($a, $b, $c); 
+var_dump($a, $b, $c);
+
+echo "Done\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg4.php.expectf
new file mode 100644
index 000000000..348a0974c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg4.php.expectf
@@ -0,0 +1,20 @@
+int(-1)
+int(-1)
+array(1) {
+  [0]=>
+  string(2) "-1"
+}
+int(-1)
+int(-1)
+array(1) {
+  [0]=>
+  string(2) "-1"
+}
+HipHop Warning: %a
+int(-1)
+int(-1)
+array(1) {
+  [0]=>
+  string(2) "-1"
+}
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_basic.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_basic.php
new file mode 100644
index 000000000..4061d5e5c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_basic.php
@@ -0,0 +1,69 @@
+<?php
+/* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test basic functionality of mb_ereg
+ */
+
+echo "*** Testing mb_ereg() : basic functionality ***\n";
+
+if(mb_regex_encoding('utf-8') == true) {
+	echo "Regex encoding set to utf-8\n";
+} else {
+	echo "Could not set regex encoding to utf-8\n";
+}
+$string_ascii = b'This is an English string. 0123456789.';
+$regex_ascii1 = b'(.*is)+.*\.[[:blank:]][0-9]{9}';
+$regex_ascii2 = b'.*is+';
+
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+$regex_mb1 = base64_decode('KOaXpeacrOiqnikuKj8oWzEtOV0rKQ==');
+$regex_mb2 = base64_decode('5LiW55WM');
+
+echo "\n**-- ASCII String --**\n";
+echo "-- Without \$regs argument--\n";
+var_dump(mb_ereg($regex_ascii1, $string_ascii));
+var_dump(mb_ereg($regex_ascii2, $string_ascii));
+echo "--With \$regs argument --\n";
+var_dump(mb_ereg($regex_ascii1, $string_ascii, $regs_ascii1));
+base64_encode_var_dump($regs_ascii1);
+var_dump(mb_ereg($regex_ascii2, $string_ascii, $regs_ascii2));
+base64_encode_var_dump($regs_ascii2);
+
+echo "\n**-- Multibyte String --**\n";
+echo "-- Without \$regs argument --\n";
+var_dump(mb_ereg($regex_mb1, $string_mb));
+var_dump(mb_ereg($regex_mb2, $string_mb));
+echo "-- With \$regs argument --\n";
+var_dump(mb_ereg($regex_mb1, $string_mb, $regs_mb1));
+base64_encode_var_dump($regs_mb1);
+var_dump(mb_ereg($regex_mb2, $string_mb, $regs_mb2));
+var_dump($regs_mb2);
+
+echo "Done";
+
+/**
+ * replicate a var dump of an array but outputted string values are base64 encoded
+ *
+ * @param array $regs
+ */
+function base64_encode_var_dump($regs) {
+	if ($regs) {
+		echo "array(" . count($regs) . ") {\n";
+		foreach ($regs as $key => $value) {
+			echo "  [$key]=>\n  ";
+			if (is_string($value)) {
+				var_dump(base64_encode($value));
+			} else {
+				var_dump($value);
+			}
+		}
+		echo "}\n";
+	} else {
+		echo "NULL\n";
+	}
+}
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_basic.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_basic.php.expectf
new file mode 100644
index 000000000..a463d5e67
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_basic.php.expectf
@@ -0,0 +1,38 @@
+*** Testing mb_ereg() : basic functionality ***
+Regex encoding set to utf-8
+
+**-- ASCII String --**
+-- Without $regs argument--
+int(1)
+int(1)
+--With $regs argument --
+int(36)
+array(2) {
+  [0]=>
+  string(48) "VGhpcyBpcyBhbiBFbmdsaXNoIHN0cmluZy4gMDEyMzQ1Njc4"
+  [1]=>
+  string(24) "VGhpcyBpcyBhbiBFbmdsaXM="
+}
+int(17)
+array(1) {
+  [0]=>
+  string(24) "VGhpcyBpcyBhbiBFbmdsaXM="
+}
+
+**-- Multibyte String --**
+-- Without $regs argument --
+int(1)
+bool(false)
+-- With $regs argument --
+int(35)
+array(3) {
+  [0]=>
+  string(48) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzQ="
+  [1]=>
+  string(12) "5pel5pys6Kqe"
+  [2]=>
+  string(8) "MTIzNA=="
+}
+bool(false)
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php
new file mode 100644
index 000000000..9f7ee034e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php
@@ -0,0 +1,28 @@
+<?php
+/* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test behaviour of mb_ereg() when passed an incorrcect number of arguments
+ */
+
+echo "*** Testing mb_ereg() : error conditions ***\n";
+
+
+//Test mb_ereg with one more than the expected number of arguments
+echo "\n-- Testing mb_ereg() function with more than expected no. of arguments --\n";
+$pattern = b'string_val';
+$string = b'string_val';
+$registers = array(1, 2);
+$extra_arg = 10;
+var_dump( mb_ereg($pattern, $string, $registers, $extra_arg) );
+
+// Testing mb_ereg with one less than the expected number of arguments
+echo "\n-- Testing mb_ereg() function with less than expected no. of arguments --\n";
+$pattern = b'string_val';
+var_dump( mb_ereg($pattern) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php.expectf
new file mode 100644
index 000000000..f28a7afe0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_ereg() : error conditions ***
+
+-- Testing mb_ereg() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_ereg() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php
new file mode 100644
index 000000000..a4a9d0030
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php
@@ -0,0 +1,32 @@
+<?php
+/* Prototype  : bool mb_ereg_match(string $pattern, string $string [,string $option])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test mb_ereg_match by passing an incorrect number of arguments
+ */
+
+echo "*** Testing mb_ereg_match() : error conditions ***\n";
+
+
+//Test mb_ereg_match with one more than the expected number of arguments
+echo "\n-- Testing mb_ereg_match() function with more than expected no. of arguments --\n";
+$pattern = b'string_val';
+$string = b'string_val';
+$option = 'string_val';
+$extra_arg = 10;
+var_dump( mb_ereg_match($pattern, $string, $option, $extra_arg) );
+
+// Testing mb_ereg_match with one less than the expected number of arguments
+echo "\n-- Testing mb_ereg_match() function with less than expected no. of arguments --\n";
+$pattern = b'string_val';
+var_dump( mb_ereg_match($pattern) );
+
+// Testing mb_ereg_match with zero arguments
+echo "\n-- Testing mb_ereg_match() function with zero arguments --\n";
+var_dump( mb_ereg_match() );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php.expectf
new file mode 100644
index 000000000..2c6aee387
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php.expectf
@@ -0,0 +1,14 @@
+*** Testing mb_ereg_match() : error conditions ***
+
+-- Testing mb_ereg_match() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_ereg_match() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_ereg_match() function with zero arguments --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_callback.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_callback.php
new file mode 100644
index 000000000..9d86fc500
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_callback.php
@@ -0,0 +1,4 @@
+<?php
+$str = 'abc 123 #",; $foo';
+echo mb_ereg_replace_callback('(\S+)', function($m){return $m[1].'('.strlen($m[1]).')';}, $str);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_callback.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_callback.php.expectf
new file mode 100644
index 000000000..141b84253
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_callback.php.expectf
@@ -0,0 +1 @@
+abc(3) 123(3) #",;(4) $foo(4)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php
new file mode 100644
index 000000000..e0465a2e5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php
@@ -0,0 +1,26 @@
+<?php
+/* Prototype  : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option])
+ * Description: Replace regular expression for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_ereg_replace() : error conditions ***\n";
+
+//Test mb_ereg_replace with one more than the expected number of arguments
+echo "\n-- Testing mb_ereg_replace() function with more than expected no. of arguments --\n";
+$pattern = b'[a-k]';
+$replacement = b'1';
+$string = b'string_val';
+$option = '';
+$extra_arg = 10;
+var_dump( mb_ereg_replace($pattern, $replacement, $string, $option, $extra_arg) );
+
+// Testing mb_ereg_replace with one less than the expected number of arguments
+echo "\n-- Testing mb_ereg_replace() function with less than expected no. of arguments --\n";
+$pattern = b'string_val';
+$replacement = b'string_val';
+var_dump( mb_ereg_replace($pattern, $replacement) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php.expectf
new file mode 100644
index 000000000..68bec38f6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_ereg_replace() : error conditions ***
+
+-- Testing mb_ereg_replace() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_ereg_replace() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php
new file mode 100644
index 000000000..2f411ffaf
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php
@@ -0,0 +1,93 @@
+<?php
+/* Prototype  : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option])
+ * Description: Replace regular expression for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_ereg_replace() : usage variations ***\n";
+
+// Initialise function arguments not being substituted (if any)
+$pattern = '[a-z]';
+$string = 'string_val';
+$option = '';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of the array for pattern
+
+$iterator = 1;
+foreach($inputs as $input) {
+      echo "\n-- Iteration $iterator --\n";
+      var_dump( mb_ereg_replace($pattern, $input, $string, $option) );
+      $iterator++;
+};
+fclose($fp);
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php.expectf
new file mode 100644
index 000000000..253575f78
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_ereg_replace() : usage variations ***
+
+-- Iteration 1 --
+string(10) "000000_000"
+
+-- Iteration 2 --
+string(10) "111111_111"
+
+-- Iteration 3 --
+string(46) "123451234512345123451234512345_123451234512345"
+
+-- Iteration 4 --
+string(46) "-2345-2345-2345-2345-2345-2345_-2345-2345-2345"
+
+-- Iteration 5 --
+string(37) "10.510.510.510.510.510.5_10.510.510.5"
+
+-- Iteration 6 --
+string(46) "-10.5-10.5-10.5-10.5-10.5-10.5_-10.5-10.5-10.5"
+
+-- Iteration 7 --
+string(109) "123456789000123456789000123456789000123456789000123456789000123456789000_123456789000123456789000123456789000"
+
+-- Iteration 8 --
+string(118) "1.23456789E-91.23456789E-91.23456789E-91.23456789E-91.23456789E-91.23456789E-9_1.23456789E-91.23456789E-91.23456789E-9"
+
+-- Iteration 9 --
+string(28) "0.50.50.50.50.50.5_0.50.50.5"
+
+-- Iteration 10 --
+string(1) "_"
+
+-- Iteration 11 --
+string(1) "_"
+
+-- Iteration 12 --
+string(10) "111111_111"
+
+-- Iteration 13 --
+string(1) "_"
+
+-- Iteration 14 --
+string(10) "111111_111"
+
+-- Iteration 15 --
+string(1) "_"
+
+-- Iteration 16 --
+string(1) "_"
+
+-- Iteration 17 --
+string(1) "_"
+
+-- Iteration 18 --
+string(46) "UTF-8UTF-8UTF-8UTF-8UTF-8UTF-8_UTF-8UTF-8UTF-8"
+
+-- Iteration 19 --
+string(46) "UTF-8UTF-8UTF-8UTF-8UTF-8UTF-8_UTF-8UTF-8UTF-8"
+
+-- Iteration 20 --
+string(46) "UTF-8UTF-8UTF-8UTF-8UTF-8UTF-8_UTF-8UTF-8UTF-8"
+
+-- Iteration 21 --
+string(46) "UTF-8UTF-8UTF-8UTF-8UTF-8UTF-8_UTF-8UTF-8UTF-8"
+
+-- Iteration 22 --
+string(1) "_"
+
+-- Iteration 23 --
+string(1) "_"
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php
new file mode 100644
index 000000000..78ee1d35c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php
@@ -0,0 +1,94 @@
+<?php
+/* Prototype  : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option])
+ * Description: Replace regular expression for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_ereg_replace() : usage variations ***\n";
+
+// Initialise function arguments not being substituted (if any)
+$pattern = '[a-z]';
+$replacement = 'string_val';
+$option = '';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of the array for pattern
+
+$iterator = 1;
+foreach($inputs as $input) {
+      echo "\n-- Iteration $iterator --\n";
+      var_dump( mb_ereg_replace($pattern, $replacement, $input, $option) );
+      $iterator++;
+};
+
+fclose($fp);
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php.expectf
new file mode 100644
index 000000000..d30f62082
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_ereg_replace() : usage variations ***
+
+-- Iteration 1 --
+string(1) "0"
+
+-- Iteration 2 --
+string(1) "1"
+
+-- Iteration 3 --
+string(5) "12345"
+
+-- Iteration 4 --
+string(5) "-2345"
+
+-- Iteration 5 --
+string(4) "10.5"
+
+-- Iteration 6 --
+string(5) "-10.5"
+
+-- Iteration 7 --
+string(12) "123456789000"
+
+-- Iteration 8 --
+string(13) "1.23456789E-9"
+
+-- Iteration 9 --
+string(3) "0.5"
+
+-- Iteration 10 --
+string(0) ""
+
+-- Iteration 11 --
+string(0) ""
+
+-- Iteration 12 --
+string(1) "1"
+
+-- Iteration 13 --
+string(0) ""
+
+-- Iteration 14 --
+string(1) "1"
+
+-- Iteration 15 --
+string(0) ""
+
+-- Iteration 16 --
+string(0) ""
+
+-- Iteration 17 --
+string(0) ""
+
+-- Iteration 18 --
+string(5) "UTF-8"
+
+-- Iteration 19 --
+string(5) "UTF-8"
+
+-- Iteration 20 --
+string(5) "UTF-8"
+
+-- Iteration 21 --
+string(5) "UTF-8"
+
+-- Iteration 22 --
+string(0) ""
+
+-- Iteration 23 --
+string(0) ""
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php
new file mode 100644
index 000000000..f9b129439
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php
@@ -0,0 +1,94 @@
+<?php
+/* Prototype  : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option])
+ * Description: Replace regular expression for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_ereg_replace() : usage variations ***\n";
+
+// Initialise function arguments not being substituted (if any)
+$pattern = '[a-k]';
+$replacement = '1';
+$string = 'string_val';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of the array for pattern
+
+$iterator = 1;
+foreach($inputs as $input) {
+      echo "\n-- Iteration $iterator --\n";
+      var_dump( mb_ereg_replace($pattern, $replacement, $string, $input) );
+      $iterator++;
+};
+
+fclose($fp);
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php.expectf
new file mode 100644
index 000000000..361592129
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_ereg_replace() : usage variations ***
+
+-- Iteration 1 --
+string(10) "str1n1_v1l"
+
+-- Iteration 2 --
+string(10) "str1n1_v1l"
+
+-- Iteration 3 --
+string(10) "str1n1_v1l"
+
+-- Iteration 4 --
+string(10) "str1n1_v1l"
+
+-- Iteration 5 --
+string(10) "str1n1_v1l"
+
+-- Iteration 6 --
+string(10) "str1n1_v1l"
+
+-- Iteration 7 --
+string(10) "str1n1_v1l"
+
+-- Iteration 8 --
+string(10) "str1n1_v1l"
+
+-- Iteration 9 --
+string(10) "str1n1_v1l"
+
+-- Iteration 10 --
+string(10) "str1n1_v1l"
+
+-- Iteration 11 --
+string(10) "str1n1_v1l"
+
+-- Iteration 12 --
+string(10) "str1n1_v1l"
+
+-- Iteration 13 --
+string(10) "str1n1_v1l"
+
+-- Iteration 14 --
+string(10) "str1n1_v1l"
+
+-- Iteration 15 --
+string(10) "str1n1_v1l"
+
+-- Iteration 16 --
+string(10) "str1n1_v1l"
+
+-- Iteration 17 --
+string(10) "str1n1_v1l"
+
+-- Iteration 18 --
+string(10) "str1n1_v1l"
+
+-- Iteration 19 --
+string(10) "str1n1_v1l"
+
+-- Iteration 20 --
+string(10) "str1n1_v1l"
+
+-- Iteration 21 --
+string(10) "str1n1_v1l"
+
+-- Iteration 22 --
+string(10) "str1n1_v1l"
+
+-- Iteration 23 --
+string(10) "str1n1_v1l"
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_pos.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_pos.php
new file mode 100644
index 000000000..30761c64d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_pos.php
@@ -0,0 +1,15 @@
+<?php
+mb_regex_encoding('iso-8859-1');
+$test_str = 'I�t�rn�ti�n�liz�ti�n';
+
+if(mb_ereg_search_init($test_str))
+{
+	$val=mb_ereg_search_pos("n�ti�n");
+	
+	var_dump($val);
+	
+}
+else{
+	var_dump("false");
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_pos.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_pos.php.expectf
new file mode 100644
index 000000000..bdaa2e2bc
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_pos.php.expectf
@@ -0,0 +1,6 @@
+array(2) {
+  [0]=>
+  int(5)
+  [1]=>
+  int(6)
+}
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_regs.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_regs.php
new file mode 100644
index 000000000..225177013
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_regs.php
@@ -0,0 +1,15 @@
+<?php
+    // homepage: 
+    
+    //$mb_str = "��仍亠从��亠亶 个亠亟仂��仂于亳�� ��舒��舒仄舒亰仂于 弍��仍 ��仍亠从��亠亶 个亠亟仂��仂于亳�� ��舒��舒仄舒亰仂于 弍��仍 kyrillischer string string";
+    //      = "Lorem ipsum dolor sit amet"
+    
+    mb_ereg_search_init("��仍亠从��亠亶 个亠亟仂��仂于亳�� ��舒��舒仄舒亰仂于 弍��仍 ��仍亠从��亠亶 个亠亟仂��仂于亳�� ��舒��舒仄舒亰仂于 弍��仍");
+    
+    
+    
+    $match= mb_ereg_search_regs("仂于");
+    var_dump($match);  
+    
+    
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_regs.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_regs.php.expectf
new file mode 100644
index 000000000..b58c8d5c1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_search_regs.php.expectf
@@ -0,0 +1,4 @@
+array(1) {
+  [0]=>
+  string(4) "仂于"
+}
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php
new file mode 100644
index 000000000..3ca46edde
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php
@@ -0,0 +1,100 @@
+<?php
+/* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test behaviour of mb_ereg() when passed different data types as $string arg
+ */
+
+echo "*** Testing mb_ereg() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$pattern = 'str';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $string argument
+$inputs = array(
+
+// int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+// float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+// null data
+/*10*/ NULL,
+       null,
+
+// boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+ 
+// empty data
+/*16*/ "",
+       '',
+
+// string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+ 
+// object data
+/*21*/ new classA(),
+
+// undefined data
+/*22*/ @$undefined_var,
+
+// unset data
+/*23*/ @$unset_var,
+
+// resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_ereg()
+$iterator = 1;
+foreach($inputs as $input) {
+	if (@is_array($regs)){
+		$regs = null;
+	}
+	echo "\n-- Iteration $iterator --\n";
+	var_dump( mb_ereg($pattern, $input, $regs) );
+	var_dump($regs);
+	$iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php.expectf
new file mode 100644
index 000000000..10194c351
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php.expectf
@@ -0,0 +1,105 @@
+*** Testing mb_ereg() : usage variations ***
+
+-- Iteration 1 --
+bool(false)
+NULL
+
+-- Iteration 2 --
+bool(false)
+NULL
+
+-- Iteration 3 --
+bool(false)
+NULL
+
+-- Iteration 4 --
+bool(false)
+NULL
+
+-- Iteration 5 --
+bool(false)
+NULL
+
+-- Iteration 6 --
+bool(false)
+NULL
+
+-- Iteration 7 --
+bool(false)
+NULL
+
+-- Iteration 8 --
+bool(false)
+NULL
+
+-- Iteration 9 --
+bool(false)
+NULL
+
+-- Iteration 10 --
+bool(false)
+NULL
+
+-- Iteration 11 --
+bool(false)
+NULL
+
+-- Iteration 12 --
+bool(false)
+NULL
+
+-- Iteration 13 --
+bool(false)
+NULL
+
+-- Iteration 14 --
+bool(false)
+NULL
+
+-- Iteration 15 --
+bool(false)
+NULL
+
+-- Iteration 16 --
+bool(false)
+NULL
+
+-- Iteration 17 --
+bool(false)
+NULL
+
+-- Iteration 18 --
+int(3)
+array(1) {
+  [0]=>
+  string(3) "str"
+}
+
+-- Iteration 19 --
+int(3)
+array(1) {
+  [0]=>
+  string(3) "str"
+}
+
+-- Iteration 20 --
+bool(false)
+NULL
+
+-- Iteration 21 --
+bool(false)
+NULL
+
+-- Iteration 22 --
+bool(false)
+NULL
+
+-- Iteration 23 --
+bool(false)
+NULL
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation5.php b/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation5.php
new file mode 100644
index 000000000..340d29e33
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation5.php
@@ -0,0 +1,55 @@
+<?php
+/* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
+ * Description: Regular expression match for multibyte string
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test mb_ereg with anchors (start and end of string) in $pattern
+ */
+
+echo "*** Testing mb_ereg() : usage variations ***\n";
+
+mb_regex_encoding('utf-8');
+
+$string_ascii = b'This is an English string. 0123456789.';
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+$regex = b'^.*?[[:blank:]]?[[:punct:][:digit:]]+\.?$';
+
+echo "\nASCII String without \$regs arg:\t\t";
+var_dump(mb_ereg($regex, $string_ascii));
+echo "ASCII String with \$regs arg:\n";
+var_dump(mb_ereg($regex, $string_ascii, $regs_ascii));
+base64_encode_var_dump($regs_ascii);
+
+echo "\nMultibyte String without \$regs arg:\t";
+var_dump(mb_ereg($regex, $string_mb));
+echo "Multubyte String with \$regs arg:\n";
+var_dump(mb_ereg($regex, $string_mb, $regs_mb));
+base64_encode_var_dump($regs_mb);
+
+echo "Done";
+
+/**
+ * replicate a var dump of an array but outputted string values are base64 encoded
+ *
+ * @param array $regs
+ */
+function base64_encode_var_dump($regs) {
+	if ($regs) {
+		echo "array(" . count($regs) . ") {\n";
+		foreach ($regs as $key => $value) {
+			echo "  [$key]=>\n  ";
+			if (is_string($value)) {
+				var_dump(base64_encode($value));
+			} else {
+				var_dump($value);
+			}
+		}
+		echo "}\n";
+	} else {
+		echo "NULL\n";
+	}
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation5.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation5.php.expectf
new file mode 100644
index 000000000..b3260cefe
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation5.php.expectf
@@ -0,0 +1,18 @@
+*** Testing mb_ereg() : usage variations ***
+
+ASCII String without $regs arg:		int(1)
+ASCII String with $regs arg:
+int(38)
+array(1) {
+  [0]=>
+  string(52) "VGhpcyBpcyBhbiBFbmdsaXNoIHN0cmluZy4gMDEyMzQ1Njc4OS4="
+}
+
+Multibyte String without $regs arg:	int(1)
+Multubyte String with $regs arg:
+int(53)
+array(1) {
+  [0]=>
+  string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+}
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_eregi.php b/hphp/test/zend/bad/ext-mbstring/mb_eregi.php
new file mode 100644
index 000000000..f3aebeec9
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_eregi.php
@@ -0,0 +1,8 @@
+<?php
+
+mb_regex_encoding('utf-8');
+
+var_dump(mb_eregi('z', 'XYZ'));
+var_dump(mb_eregi('xyzp', 'XYZ'));
+var_dump(mb_eregi('旦', '��辰端'));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_eregi.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_eregi.php.expectf
new file mode 100644
index 000000000..80fc9d1f4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_eregi.php.expectf
@@ -0,0 +1,3 @@
+int(1)
+bool(false)
+int(1)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_eregi_invalid_arguments.php b/hphp/test/zend/bad/ext-mbstring/mb_eregi_invalid_arguments.php
new file mode 100644
index 000000000..f3aebeec9
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_eregi_invalid_arguments.php
@@ -0,0 +1,8 @@
+<?php
+
+mb_regex_encoding('utf-8');
+
+var_dump(mb_eregi('z', 'XYZ'));
+var_dump(mb_eregi('xyzp', 'XYZ'));
+var_dump(mb_eregi('旦', '��辰端'));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_eregi_invalid_arguments.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_eregi_invalid_arguments.php.expectf
new file mode 100644
index 000000000..80fc9d1f4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_eregi_invalid_arguments.php.expectf
@@ -0,0 +1,3 @@
+int(1)
+bool(false)
+int(1)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_http_input.php b/hphp/test/zend/bad/ext-mbstring/mb_http_input.php
new file mode 100644
index 000000000..f89a0045d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_http_input.php
@@ -0,0 +1,36 @@
+<?php
+parse_str("b=日本語0123456789日本語カタカナひらがな", $_GET);
+
+parse_str("a=日本語0123456789日本語カタカナひらがな", $_POST);
+
+// TODO: This is not a real test.... Need to change so that it does real testing
+//$debug = true;
+ini_set('include_path', dirname(__FILE__));
+include_once('common.inc');
+
+$ini = ini_get('mbstring.http_input');
+
+// It must be url encoded....
+// echo vars
+echo $_POST['a']."\n";
+echo $_GET['b']."\n";
+
+// Get encoding
+$enc = mb_http_input('P');
+
+// check
+if (empty($ini)) {
+	// Must be pass
+	if ($enc === 'pass') {
+		echo "OK\n";
+	}
+	else {
+		echo "NG\n";
+	}
+}
+else {
+	// Some encoding
+	echo "This heppens when php.ini-dist is not used\n";
+}
+
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_http_input.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_http_input.php.expectf
new file mode 100644
index 000000000..51b100820
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_http_input.php.expectf
@@ -0,0 +1,3 @@
+日本語0123456789日本語カタカナひらがな
+日本語0123456789日本語カタカナひらがな
+OK
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_http_output.php b/hphp/test/zend/bad/ext-mbstring/mb_http_output.php
new file mode 100644
index 000000000..4d22da08f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_http_output.php
@@ -0,0 +1,56 @@
+<?php
+//TODO: Add more encoding. Wrong paramter type test.
+//$debug = true;
+ini_set('include_path', dirname(__FILE__));
+include_once('common.inc');
+
+// Set HTTP output encoding to ASCII
+$r = mb_http_output('ASCII');
+($r === TRUE) ? print "OK_ASCII_SET\n" : print "NG_ASCII_SET\n";
+$enc = mb_http_output();
+print "$enc\n";
+
+// Set HTTP output encoding to SJIS
+$r = mb_http_output('SJIS');
+($r === TRUE) ? print "OK_SJIS_SET\n" : print "NG_SJIS_SET\n";
+$enc = mb_http_output();
+print "$enc\n";
+
+// Set HTTP output encoding to JIS
+$r = mb_http_output('JIS');
+($r === TRUE) ? print "OK_JIS_SET\n" : print "NG_JIS_SET\n";
+$enc = mb_http_output();
+print "$enc\n";
+
+// Set HTTP output encoding to UTF8
+$r = mb_http_output('UTF-8');
+($r === TRUE) ? print "OK_UTF-8_SET\n" : print "NG_UTF-8_SET\n";
+$enc = mb_http_output();
+print "$enc\n";
+
+// Set HTTP output encoding to EUC-JP
+$r = mb_http_output('EUC-JP');
+($r === TRUE) ? print "OK_EUC-JP_SET\n" : print "NG_EUC-JP_SET\n";
+$enc = mb_http_output();
+print "$enc\n";
+
+// Invalid parameters
+print "== INVALID PARAMETER ==\n";
+
+// Note: Bad string raise Warning. Bad Type raise Notice (Type Conversion) and Warning....
+$r = mb_http_output('BAD_NAME');
+($r === FALSE) ? print "OK_BAD_SET\n" : print "NG_BAD_SET\n";
+$enc = mb_http_output();
+print "$enc\n";
+
+$r = mb_http_output($t_ary);
+($r === FALSE) ? print "OK_BAD_ARY_SET\n" : print "NG_BAD_ARY_SET\n";
+$enc = mb_http_output();
+print "$enc\n";
+
+$r = mb_http_output($t_obj);
+($r === FALSE) ? print "OK_BAD_OBJ_SET\n" : print "NG_BAD_OBJ_SET\n";
+$enc = mb_http_output();
+print "$enc\n";
+
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_http_output.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_http_output.php.expectf
new file mode 100644
index 000000000..a57e2a3a9
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_http_output.php.expectf
@@ -0,0 +1,20 @@
+OK_ASCII_SET
+ASCII
+OK_SJIS_SET
+SJIS
+OK_JIS_SET
+JIS
+OK_UTF-8_SET
+UTF-8
+OK_EUC-JP_SET
+EUC-JP
+== INVALID PARAMETER ==
+ERR: Warning
+OK_BAD_SET
+EUC-JP
+ERR: Warning
+OK_BAD_ARY_SET
+EUC-JP
+ERR: Warning
+OK_BAD_OBJ_SET
+EUC-JP
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding.php b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding.php
new file mode 100644
index 000000000..a5831557a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding.php
@@ -0,0 +1,44 @@
+<?php
+// TODO: 
+//$debug = true;
+ini_set('include_path', dirname(__FILE__));
+include_once('common.inc');
+
+// EUC-JP
+$r = mb_internal_encoding('EUC-JP');
+($r === TRUE) ? print "OK_EUC-JP_SET\n" : print "NG_EUC-JP_SET\n";
+$enc = mb_internal_encoding();
+print "$enc\n";
+
+// UTF-8
+$r = mb_internal_encoding('UTF-8');
+($r === TRUE) ? print "OK_UTF-8_SET\n" : print "NG_UTF-8_SET\n";
+$enc = mb_internal_encoding();
+print "$enc\n";
+
+// ASCII
+$r = mb_internal_encoding('ASCII');
+($r === TRUE) ? print "OK_ASCII_SET\n" : print "NG_ASCII_SET\n";
+$enc = mb_internal_encoding();
+print "$enc\n";
+
+// Invalid Parameter
+print "== INVALID PARAMETER ==\n";
+
+// Note: Other than string type, PHP raises Warning
+$r = mb_internal_encoding('BAD');
+($r === FALSE) ? print "OK_BAD_SET\n" : print "NG_BAD_SET\n";
+$enc = mb_internal_encoding();
+print "$enc\n";
+
+$r = mb_internal_encoding($t_ary);
+($r === FALSE) ? print "OK_BAD_ARY_SET\n" : print "NG_BAD_ARY_SET\n";
+$enc = mb_internal_encoding();
+print "$enc\n";
+
+$r = mb_internal_encoding($t_obj);
+($r === FALSE) ? print "OK_BAD_OBJ_SET\n" : print "NG_BAD_OBJ_SET\n";
+$enc = mb_internal_encoding();
+print "$enc\n";
+
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding.php.expectf
new file mode 100644
index 000000000..df4e953ec
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding.php.expectf
@@ -0,0 +1,16 @@
+OK_EUC-JP_SET
+EUC-JP
+OK_UTF-8_SET
+UTF-8
+OK_ASCII_SET
+ASCII
+== INVALID PARAMETER ==
+ERR: Warning
+OK_BAD_SET
+ASCII
+ERR: Warning
+OK_BAD_ARY_SET
+ASCII
+ERR: Warning
+OK_BAD_OBJ_SET
+ASCII
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_error1.php
new file mode 100644
index 000000000..75abd4629
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_error1.php
@@ -0,0 +1,20 @@
+<?php
+/* Prototype  : string mb_internal_encoding([string $encoding])
+ * Description: Sets the current internal encoding or 
+ * Returns the current internal encoding as a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test mb_internal_encoding with one more than the expected number of arguments
+ */
+
+echo "*** Testing mb_internal_encoding() : error conditions ***\n";
+
+echo "\n-- Testing mb_internal_encoding() function with more than expected no. of arguments --\n";
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_internal_encoding($encoding, $extra_arg) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_error1.php.expectf
new file mode 100644
index 000000000..0c9ad1621
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_error1.php.expectf
@@ -0,0 +1,6 @@
+*** Testing mb_internal_encoding() : error conditions ***
+
+-- Testing mb_internal_encoding() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation1.php
new file mode 100644
index 000000000..b697a36c5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation1.php
@@ -0,0 +1,93 @@
+<?php
+/* Prototype  : string mb_internal_encoding([string $encoding])
+ * Description: Sets the current internal encoding or Returns 
+ * the current internal encoding as a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types as $encoding to mb_internal_encoding() to test behaviour
+ * Where possible 'UTF-8' has been entered as a string value
+ */
+
+echo "*** Testing mb_internal_encoding() : usage variations ***\n";
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_internal_encoding()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_internal_encoding($input) );
+  $iterator++;
+};
+
+fclose($fp);
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation1.php.expectf
new file mode 100644
index 000000000..6f41ea032
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation1.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_internal_encoding() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+bool(true)
+
+-- Iteration 19 --
+bool(true)
+
+-- Iteration 20 --
+bool(true)
+
+-- Iteration 21 --
+bool(true)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation2.php
new file mode 100644
index 000000000..c75d5a472
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation2.php
@@ -0,0 +1,82 @@
+<?php
+/* Prototype  : string mb_internal_encoding([string $encoding])
+ * Description: Sets the current internal encoding or Returns 
+ * the current internal encoding as a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test all listed encoding types from php.net to check all are known to function
+ * NB: The strings passed are *NOT* necessarily encoded in the encoding passed to the function.
+ * This test is purely to see whether the function recognises the encoding.
+ */
+
+echo "*** Testing mb_internal_encoding() : usage variations ***\n";
+
+$encoding = array('UCS-4',			/*1*/
+                  'UCS-4BE',
+                  'UCS-4LE',
+                  'UCS-2',
+                  'UCS-2BE',		/*5*/
+                  'UCS-2LE',
+                  'UTF-32',
+                  'UTF-32BE',
+                  'UTF-32LE',
+                  'UTF-16',			/*10*/
+                  'UTF-16BE',
+                  'UTF-16LE',
+                  'UTF-7',
+                  'UTF7-IMAP',
+                  'UTF-8',			/*15*/
+                  'ASCII',
+                  'EUC-JP',
+                  'SJIS',
+                  'eucJP-win',
+                  'SJIS-win',		/*20*/
+                  'ISO-2022-JP',
+                  'JIS',
+                  'ISO-8859-1',
+                  'ISO-8859-2',
+                  'ISO-8859-3',		/*25*/
+                  'ISO-8859-4',
+                  'ISO-8859-5',
+                  'ISO-8859-6',
+                  'ISO-8859-7',
+                  'ISO-8859-8',		/*30*/
+                  'ISO-8859-9',
+                  'ISO-8859-10',
+                  'ISO-8859-13',
+                  'ISO-8859-14',
+                  'ISO-8859-15',	/*35*/
+                  'byte2be',
+                  'byte2le',
+                  'byte4be',
+                  'byte4le',
+                  'BASE64',			/*40*/
+                  'HTML-ENTITIES',
+                  '7bit',
+                  '8bit',
+                  'EUC-CN',
+                  'CP936',			/*45*/
+                  'HZ',
+                  'EUC-TW',
+                  'CP950',
+                  'BIG-5',
+                  'EUC-KR',			/*50*/
+                  'UHC',
+                  'ISO-2022-KR',
+                  'Windows-1251',
+                  'Windows-1252',
+                  'CP866',			/*55*/
+                  'KOI8-R');		/*56*/
+
+$iterator = 1;
+foreach($encoding as $enc) {
+	echo "\n-- Iteration $iterator --\n";
+	var_dump(mb_internal_encoding());
+	var_dump(mb_internal_encoding($enc));
+	var_dump(mb_internal_encoding());
+	$iterator++;
+}
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation2.php.expectf
new file mode 100644
index 000000000..ad912be07
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_internal_encoding_variation2.php.expectf
@@ -0,0 +1,282 @@
+*** Testing mb_internal_encoding() : usage variations ***
+
+-- Iteration 1 --
+string(%d) "%s"
+bool(true)
+string(5) "UCS-4"
+
+-- Iteration 2 --
+string(5) "UCS-4"
+bool(true)
+string(7) "UCS-4BE"
+
+-- Iteration 3 --
+string(7) "UCS-4BE"
+bool(true)
+string(7) "UCS-4LE"
+
+-- Iteration 4 --
+string(7) "UCS-4LE"
+bool(true)
+string(5) "UCS-2"
+
+-- Iteration 5 --
+string(5) "UCS-2"
+bool(true)
+string(7) "UCS-2BE"
+
+-- Iteration 6 --
+string(7) "UCS-2BE"
+bool(true)
+string(7) "UCS-2LE"
+
+-- Iteration 7 --
+string(7) "UCS-2LE"
+bool(true)
+string(6) "UTF-32"
+
+-- Iteration 8 --
+string(6) "UTF-32"
+bool(true)
+string(8) "UTF-32BE"
+
+-- Iteration 9 --
+string(8) "UTF-32BE"
+bool(true)
+string(8) "UTF-32LE"
+
+-- Iteration 10 --
+string(8) "UTF-32LE"
+bool(true)
+string(6) "UTF-16"
+
+-- Iteration 11 --
+string(6) "UTF-16"
+bool(true)
+string(8) "UTF-16BE"
+
+-- Iteration 12 --
+string(8) "UTF-16BE"
+bool(true)
+string(8) "UTF-16LE"
+
+-- Iteration 13 --
+string(8) "UTF-16LE"
+bool(true)
+string(5) "UTF-7"
+
+-- Iteration 14 --
+string(5) "UTF-7"
+bool(true)
+string(9) "UTF7-IMAP"
+
+-- Iteration 15 --
+string(9) "UTF7-IMAP"
+bool(true)
+string(5) "UTF-8"
+
+-- Iteration 16 --
+string(5) "UTF-8"
+bool(true)
+string(5) "ASCII"
+
+-- Iteration 17 --
+string(5) "ASCII"
+bool(true)
+string(6) "EUC-JP"
+
+-- Iteration 18 --
+string(6) "EUC-JP"
+bool(true)
+string(4) "SJIS"
+
+-- Iteration 19 --
+string(4) "SJIS"
+bool(true)
+string(9) "eucJP-win"
+
+-- Iteration 20 --
+string(9) "eucJP-win"
+bool(true)
+string(8) "SJIS-win"
+
+-- Iteration 21 --
+string(8) "SJIS-win"
+bool(true)
+string(11) "ISO-2022-JP"
+
+-- Iteration 22 --
+string(11) "ISO-2022-JP"
+bool(true)
+string(3) "JIS"
+
+-- Iteration 23 --
+string(3) "JIS"
+bool(true)
+string(10) "ISO-8859-1"
+
+-- Iteration 24 --
+string(10) "ISO-8859-1"
+bool(true)
+string(10) "ISO-8859-2"
+
+-- Iteration 25 --
+string(10) "ISO-8859-2"
+bool(true)
+string(10) "ISO-8859-3"
+
+-- Iteration 26 --
+string(10) "ISO-8859-3"
+bool(true)
+string(10) "ISO-8859-4"
+
+-- Iteration 27 --
+string(10) "ISO-8859-4"
+bool(true)
+string(10) "ISO-8859-5"
+
+-- Iteration 28 --
+string(10) "ISO-8859-5"
+bool(true)
+string(10) "ISO-8859-6"
+
+-- Iteration 29 --
+string(10) "ISO-8859-6"
+bool(true)
+string(10) "ISO-8859-7"
+
+-- Iteration 30 --
+string(10) "ISO-8859-7"
+bool(true)
+string(10) "ISO-8859-8"
+
+-- Iteration 31 --
+string(10) "ISO-8859-8"
+bool(true)
+string(10) "ISO-8859-9"
+
+-- Iteration 32 --
+string(10) "ISO-8859-9"
+bool(true)
+string(11) "ISO-8859-10"
+
+-- Iteration 33 --
+string(11) "ISO-8859-10"
+bool(true)
+string(11) "ISO-8859-13"
+
+-- Iteration 34 --
+string(11) "ISO-8859-13"
+bool(true)
+string(11) "ISO-8859-14"
+
+-- Iteration 35 --
+string(11) "ISO-8859-14"
+bool(true)
+string(11) "ISO-8859-15"
+
+-- Iteration 36 --
+string(11) "ISO-8859-15"
+bool(true)
+string(7) "byte2be"
+
+-- Iteration 37 --
+string(7) "byte2be"
+bool(true)
+string(7) "byte2le"
+
+-- Iteration 38 --
+string(7) "byte2le"
+bool(true)
+string(7) "byte4be"
+
+-- Iteration 39 --
+string(7) "byte4be"
+bool(true)
+string(7) "byte4le"
+
+-- Iteration 40 --
+string(7) "byte4le"
+bool(true)
+string(6) "BASE64"
+
+-- Iteration 41 --
+string(6) "BASE64"
+bool(true)
+string(13) "HTML-ENTITIES"
+
+-- Iteration 42 --
+string(13) "HTML-ENTITIES"
+bool(true)
+string(4) "7bit"
+
+-- Iteration 43 --
+string(4) "7bit"
+bool(true)
+string(4) "8bit"
+
+-- Iteration 44 --
+string(4) "8bit"
+bool(true)
+string(6) "EUC-CN"
+
+-- Iteration 45 --
+string(6) "EUC-CN"
+bool(true)
+string(5) "CP936"
+
+-- Iteration 46 --
+string(5) "CP936"
+bool(true)
+string(2) "HZ"
+
+-- Iteration 47 --
+string(2) "HZ"
+bool(true)
+string(6) "EUC-TW"
+
+-- Iteration 48 --
+string(6) "EUC-TW"
+bool(true)
+string(5) "CP950"
+
+-- Iteration 49 --
+string(5) "CP950"
+bool(true)
+string(5) "BIG-5"
+
+-- Iteration 50 --
+string(5) "BIG-5"
+bool(true)
+string(6) "EUC-KR"
+
+-- Iteration 51 --
+string(6) "EUC-KR"
+bool(true)
+string(3) "UHC"
+
+-- Iteration 52 --
+string(3) "UHC"
+bool(true)
+string(11) "ISO-2022-KR"
+
+-- Iteration 53 --
+string(11) "ISO-2022-KR"
+bool(true)
+string(12) "Windows-1251"
+
+-- Iteration 54 --
+string(12) "Windows-1251"
+bool(true)
+string(12) "Windows-1252"
+
+-- Iteration 55 --
+string(12) "Windows-1252"
+bool(true)
+string(5) "CP866"
+
+-- Iteration 56 --
+string(5) "CP866"
+bool(true)
+string(6) "KOI8-R"
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_regex_encoding_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_regex_encoding_variation1.php
new file mode 100644
index 000000000..0ee345439
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_regex_encoding_variation1.php
@@ -0,0 +1,92 @@
+<?php
+/* Prototype  : string mb_regex_encoding([string $encoding])
+ * Description: Returns the current encoding for regex as a string. 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Pass different data types as $encoding argument to mb_regex_encoding() to test behaviour
+ * Where possible, 'UTF-8' has been entered as a string value
+ */
+
+echo "*** Testing mb_regex_encoding() : usage variations ***\n";
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_regex_encoding()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_regex_encoding($input) );
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_regex_encoding_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_regex_encoding_variation1.php.expectf
new file mode 100644
index 000000000..1faf7c811
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_regex_encoding_variation1.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_regex_encoding() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+bool(true)
+
+-- Iteration 19 --
+bool(true)
+
+-- Iteration 20 --
+bool(true)
+
+-- Iteration 21 --
+bool(true)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_regex_set_options.php b/hphp/test/zend/bad/ext-mbstring/mb_regex_set_options.php
new file mode 100644
index 000000000..89a05494b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_regex_set_options.php
@@ -0,0 +1,7 @@
+<?php
+	mb_regex_set_options( 'x' );
+	print mb_ereg_replace(' -', '+', '- - - - -' );
+
+	mb_regex_set_options( '' );
+	print mb_ereg_replace(' -', '+', '- - - - -' );
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_regex_set_options.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_regex_set_options.php.expectf
new file mode 100644
index 000000000..bfb01348e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_regex_set_options.php.expectf
@@ -0,0 +1 @@
++ + + + +-++++
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_split_empty_match.php b/hphp/test/zend/bad/ext-mbstring/mb_split_empty_match.php
new file mode 100644
index 000000000..f245eddb5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_split_empty_match.php
@@ -0,0 +1,3 @@
+<?php
+mb_regex_set_options('m');
+var_dump(mb_split('^', "a\nb\nc"));
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_split_empty_match.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_split_empty_match.php.expectf
new file mode 100644
index 000000000..f9dc45d1e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_split_empty_match.php.expectf
@@ -0,0 +1,10 @@
+array(3) {
+  [0]=>
+  string(2) "a
+"
+  [1]=>
+  string(2) "b
+"
+  [2]=>
+  string(1) "c"
+}
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_split_error.php b/hphp/test/zend/bad/ext-mbstring/mb_split_error.php
new file mode 100644
index 000000000..44baf08f8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_split_error.php
@@ -0,0 +1,29 @@
+<?php
+/* Prototype  : proto array mb_split(string pattern, string string [, int limit])
+ * Description: split multibyte string into array by regular expression 
+ * Source code: ext/mbstring/php_mbregex.c
+ * Alias to functions: 
+ */
+
+/*
+ * test too few and too many parameters
+ */
+
+echo "*** Testing mb_split() : error conditions ***\n";
+
+
+//Test mb_split with one more than the expected number of arguments
+echo "\n-- Testing mb_split() function with more than expected no. of arguments --\n";
+$pattern = ' ';
+$string = 'a b c d e f g';
+$limit = 0;
+$extra_arg = 10;
+var_dump( mb_split($pattern, $string, $limit, $extra_arg) );
+
+// Testing mb_split with one less than the expected number of arguments
+echo "\n-- Testing mb_split() function with less than expected no. of arguments --\n";
+$pattern = 'string_val';
+var_dump( mb_split($pattern) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_split_error.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_split_error.php.expectf
new file mode 100644
index 000000000..c2a8989c5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_split_error.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_split() : error conditions ***
+
+-- Testing mb_split() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_split() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_split_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_split_variation1.php
new file mode 100644
index 000000000..1212312b7
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_split_variation1.php
@@ -0,0 +1,92 @@
+<?php
+/* Prototype  : proto array mb_split(string pattern, string string [, int limit])
+ * Description: split multibyte string into array by regular expression 
+ * Source code: ext/mbstring/php_mbregex.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_split() : usage variations ***\n";
+
+// Initialise function arguments not being substituted (if any)
+$string = 'a b c d e f g';
+$limit = 10;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of the array for pattern
+
+$iterator = 1;
+foreach($inputs as $input) {
+      echo "\n-- Iteration $iterator --\n";
+      var_dump( mb_split($input, $string, $limit) );
+      $iterator++;
+};
+fclose($fp);
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_split_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_split_variation1.php.expectf
new file mode 100644
index 000000000..952e4df91
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_split_variation1.php.expectf
@@ -0,0 +1,144 @@
+*** Testing mb_split() : usage variations ***
+
+-- Iteration 1 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 2 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 3 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 4 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 5 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 6 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 7 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 8 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 9 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 10 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 11 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 12 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 13 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 14 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 15 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 16 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 17 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 18 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 19 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 20 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 21 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 22 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 23 --
+array(1) {
+  [0]=>
+  string(13) "a b c d e f g"
+}
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_split_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_split_variation2.php
new file mode 100644
index 000000000..9f826be10
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_split_variation2.php
@@ -0,0 +1,94 @@
+<?php
+/* Prototype  : proto array mb_split(string pattern, string string [, int limit])
+ * Description: split multibyte string into array by regular expression 
+ * Source code: ext/mbstring/php_mbregex.c
+ * Alias to functions: 
+ */
+
+
+echo "*** Testing mb_split() : usage variations ***\n";
+
+// Initialise function arguments not being substituted (if any)
+$pattern = '[a-z]';
+$limit = 10;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of the array for pattern
+
+$iterator = 1;
+foreach($inputs as $input) {
+      echo "\n-- Iteration $iterator --\n";
+      var_dump( mb_split($pattern, $input, $limit) );
+      $iterator++;
+};
+
+fclose($fp);
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_split_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_split_variation2.php.expectf
new file mode 100644
index 000000000..a26e08e57
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_split_variation2.php.expectf
@@ -0,0 +1,144 @@
+*** Testing mb_split() : usage variations ***
+
+-- Iteration 1 --
+array(1) {
+  [0]=>
+  string(1) "0"
+}
+
+-- Iteration 2 --
+array(1) {
+  [0]=>
+  string(1) "1"
+}
+
+-- Iteration 3 --
+array(1) {
+  [0]=>
+  string(5) "12345"
+}
+
+-- Iteration 4 --
+array(1) {
+  [0]=>
+  string(5) "-2345"
+}
+
+-- Iteration 5 --
+array(1) {
+  [0]=>
+  string(4) "10.5"
+}
+
+-- Iteration 6 --
+array(1) {
+  [0]=>
+  string(5) "-10.5"
+}
+
+-- Iteration 7 --
+array(1) {
+  [0]=>
+  string(12) "123456789000"
+}
+
+-- Iteration 8 --
+array(1) {
+  [0]=>
+  string(13) "1.23456789E-9"
+}
+
+-- Iteration 9 --
+array(1) {
+  [0]=>
+  string(3) "0.5"
+}
+
+-- Iteration 10 --
+array(1) {
+  [0]=>
+  string(0) ""
+}
+
+-- Iteration 11 --
+array(1) {
+  [0]=>
+  string(0) ""
+}
+
+-- Iteration 12 --
+array(1) {
+  [0]=>
+  string(1) "1"
+}
+
+-- Iteration 13 --
+array(1) {
+  [0]=>
+  string(0) ""
+}
+
+-- Iteration 14 --
+array(1) {
+  [0]=>
+  string(1) "1"
+}
+
+-- Iteration 15 --
+array(1) {
+  [0]=>
+  string(0) ""
+}
+
+-- Iteration 16 --
+array(1) {
+  [0]=>
+  string(0) ""
+}
+
+-- Iteration 17 --
+array(1) {
+  [0]=>
+  string(0) ""
+}
+
+-- Iteration 18 --
+array(1) {
+  [0]=>
+  string(5) "UTF-8"
+}
+
+-- Iteration 19 --
+array(1) {
+  [0]=>
+  string(5) "UTF-8"
+}
+
+-- Iteration 20 --
+array(1) {
+  [0]=>
+  string(5) "UTF-8"
+}
+
+-- Iteration 21 --
+array(1) {
+  [0]=>
+  string(5) "UTF-8"
+}
+
+-- Iteration 22 --
+array(1) {
+  [0]=>
+  string(0) ""
+}
+
+-- Iteration 23 --
+array(1) {
+  [0]=>
+  string(0) ""
+}
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_split_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_split_variation3.php
new file mode 100644
index 000000000..1386749ea
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_split_variation3.php
@@ -0,0 +1,93 @@
+<?php
+/* Prototype  : proto array mb_split(string pattern, string string [, int limit])
+ * Description: split multibyte string into array by regular expression 
+ * Source code: ext/mbstring/php_mbregex.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_split() : usage variations ***\n";
+
+// Initialise function arguments not being substituted (if any)
+$pattern = '[a-z]';
+$string = 'string_val';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of the array for pattern
+
+$iterator = 1;
+foreach($inputs as $input) {
+      echo "\n-- Iteration $iterator --\n";
+      var_dump( mb_split($pattern, $string, $input) );
+      $iterator++;
+};
+
+fclose($fp);
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_split_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_split_variation3.php.expectf
new file mode 100644
index 000000000..318862351
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_split_variation3.php.expectf
@@ -0,0 +1,222 @@
+*** Testing mb_split() : usage variations ***
+
+-- Iteration 1 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 2 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 3 --
+array(10) {
+  [0]=>
+  string(0) ""
+  [1]=>
+  string(0) ""
+  [2]=>
+  string(0) ""
+  [3]=>
+  string(0) ""
+  [4]=>
+  string(0) ""
+  [5]=>
+  string(0) ""
+  [6]=>
+  string(1) "_"
+  [7]=>
+  string(0) ""
+  [8]=>
+  string(0) ""
+  [9]=>
+  string(0) ""
+}
+
+-- Iteration 4 --
+array(10) {
+  [0]=>
+  string(0) ""
+  [1]=>
+  string(0) ""
+  [2]=>
+  string(0) ""
+  [3]=>
+  string(0) ""
+  [4]=>
+  string(0) ""
+  [5]=>
+  string(0) ""
+  [6]=>
+  string(1) "_"
+  [7]=>
+  string(0) ""
+  [8]=>
+  string(0) ""
+  [9]=>
+  string(0) ""
+}
+
+-- Iteration 5 --
+array(10) {
+  [0]=>
+  string(0) ""
+  [1]=>
+  string(0) ""
+  [2]=>
+  string(0) ""
+  [3]=>
+  string(0) ""
+  [4]=>
+  string(0) ""
+  [5]=>
+  string(0) ""
+  [6]=>
+  string(1) "_"
+  [7]=>
+  string(0) ""
+  [8]=>
+  string(0) ""
+  [9]=>
+  string(0) ""
+}
+
+-- Iteration 6 --
+array(10) {
+  [0]=>
+  string(0) ""
+  [1]=>
+  string(0) ""
+  [2]=>
+  string(0) ""
+  [3]=>
+  string(0) ""
+  [4]=>
+  string(0) ""
+  [5]=>
+  string(0) ""
+  [6]=>
+  string(1) "_"
+  [7]=>
+  string(0) ""
+  [8]=>
+  string(0) ""
+  [9]=>
+  string(0) ""
+}
+
+-- Iteration 7 --
+array(10) {
+  [0]=>
+  string(0) ""
+  [1]=>
+  string(0) ""
+  [2]=>
+  string(0) ""
+  [3]=>
+  string(0) ""
+  [4]=>
+  string(0) ""
+  [5]=>
+  string(0) ""
+  [6]=>
+  string(1) "_"
+  [7]=>
+  string(0) ""
+  [8]=>
+  string(0) ""
+  [9]=>
+  string(0) ""
+}
+
+-- Iteration 8 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 9 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 10 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 11 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 12 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 13 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 14 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 15 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 19 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 20 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 21 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 22 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 23 --
+array(1) {
+  [0]=>
+  string(10) "string_val"
+}
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_str_functions_opt-parameter.php b/hphp/test/zend/bad/ext-mbstring/mb_str_functions_opt-parameter.php
new file mode 100644
index 000000000..447e6cee8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_str_functions_opt-parameter.php
@@ -0,0 +1,14 @@
+<?php
+echo mb_strpos('abb', 'b', null, 'UTF-8') . "\n";
+echo mb_strrpos('abb', 'b', null, 'UTF-8') . "\n";
+echo mb_stripos('abb', 'B', null, 'UTF-8') . "\n";
+echo mb_strripos('abb', 'B', null, 'UTF-8') . "\n";
+echo mb_strstr('foobarbaz', 'ba', null, 'UTF-8') . "\n";
+echo mb_strrchr('foobarbaz', 'ba', null, 'UTF-8') . "\n";
+echo mb_stristr('foobarbaz', 'BA', null, 'UTF-8') . "\n";
+echo mb_strrichr('foobarbaz', 'BA', null, 'UTF-8') . "\n";
+echo mb_substr('foobarbaz', 6, null, 'UTF-8') . "\n";
+echo mb_strcut('foobarbaz', 6, null, 'UTF-8') . "\n";
+echo mb_strimwidth('foobar', 0, 3, null, 'UTF-8') . "\n";
+?>
+==DONE==
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_str_functions_opt-parameter.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_str_functions_opt-parameter.php.expectf
new file mode 100644
index 000000000..1153a7ab0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_str_functions_opt-parameter.php.expectf
@@ -0,0 +1,12 @@
+1
+2
+1
+2
+barbaz
+baz
+barbaz
+baz
+baz
+baz
+foo
+==DONE==
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos.php b/hphp/test/zend/bad/ext-mbstring/mb_stripos.php
new file mode 100644
index 000000000..de9344d29
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos.php
@@ -0,0 +1,110 @@
+<?php
+// TODO: Add more encodings
+
+//$debug=true;
+ini_set('include_path','.');
+include_once('common.inc');
+
+
+// Test string
+$euc_jp = b'0123この文字列は日本語です。EUC-JPを使っています。0123日本語は面倒臭い。';
+
+// EUC-JP - With encoding parameter
+mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n");
+
+echo  "== POSITIVE OFFSET ==\n";
+print  mb_stripos($euc_jp,b'日本語', 0, 'EUC-JP') . "\n";
+print  mb_stripos($euc_jp, b'0', 0,     'EUC-JP') . "\n";
+print  mb_stripos($euc_jp, 3, 0,       'EUC-JP') . "\n";
+print  mb_stripos($euc_jp, 0, 0,       'EUC-JP') . "\n";
+print  mb_stripos($euc_jp,b'日本語', 15, 'EUC-JP') . "\n";
+print  mb_stripos($euc_jp, b'0', 15,     'EUC-JP') . "\n";
+print  mb_stripos($euc_jp, 3, 15,       'EUC-JP') . "\n";
+print  mb_stripos($euc_jp, 0, 15,       'EUC-JP') . "\n";
+
+// Negative offset
+// Note: PHP Warning - offset is negative.
+// Note: For offset(-15). It does not return position of latter string. (ie the same result as -50)
+echo "== NEGATIVE OFFSET ==\n";
+$r = mb_stripos($euc_jp,b'日本語', -15, 'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_stripos($euc_jp, b'0', -15,     'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_stripos($euc_jp, 3, -15,       'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_stripos($euc_jp, 0, -15,       'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_stripos($euc_jp,b'日本語', -50, 'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_stripos($euc_jp, b'0', -50,     'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_stripos($euc_jp, 3, -50,       'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_stripos($euc_jp, 0, -50,       'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+
+// Out of range - should return false
+print ("== OUT OF RANGE ==\n");
+$r =  mb_stripos($euc_jp,b'日本語', 40, 'EUC-JP');
+($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
+$r =  mb_stripos($euc_jp, b'0', 40,     'EUC-JP');
+($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
+$r =  mb_stripos($euc_jp, 3, 40,       'EUC-JP');
+($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
+$r =   mb_stripos($euc_jp, 0, 40,       'EUC-JP');
+($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
+// Note: Returned NULL string
+// echo gettype($r). ' val '. $r ."\n"; 
+
+
+// Non-existent
+echo "== NON-EXISTENT ==\n";
+$r = mb_stripos($euc_jp, b'韓国語', 0, 'EUC-JP');
+($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
+$r = mb_stripos($euc_jp, b"\n",     0, 'EUC-JP');
+($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
+
+
+// EUC-JP - No encoding parameter
+echo "== NO ENCODING PARAMETER ==\n";
+mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
+
+print  mb_stripos($euc_jp,b'日本語', 0) . "\n";
+print  mb_stripos($euc_jp, b'0', 0) . "\n";
+print  mb_stripos($euc_jp, 3, 0) . "\n";
+print  mb_stripos($euc_jp, 0, 0) . "\n";
+
+$r = mb_stripos($euc_jp,b'韓国語', 0);
+($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
+$r = mb_stripos($euc_jp,b"\n", 0);
+($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
+
+// EUC-JP - No offset and encoding parameter
+echo "== NO OFFSET AND ENCODING PARAMETER ==\n";
+mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
+
+print  mb_stripos($euc_jp,b'日本語') . "\n";
+print  mb_stripos($euc_jp, b'0') . "\n";
+print  mb_stripos($euc_jp, 3) . "\n";
+print  mb_stripos($euc_jp, 0) . "\n";
+
+$r = mb_stripos($euc_jp,b'韓国語');
+($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
+$r = mb_stripos($euc_jp,b"\n");
+($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
+
+
+// Invalid Parameters
+echo "== INVALID PARAMETER TEST ==\n";
+
+$r = mb_stripos($euc_jp,'','EUC-JP');
+($r === FALSE) ? print("OK_NULL\n") : print("NG_NULL\n");
+$r = mb_stripos($euc_jp, $t_ary, 'EUC-JP');
+($r === FALSE) ? print("OK_ARRAY\n") : print("NG_ARRAY\n");
+$r = mb_stripos($euc_jp, $t_obj, 'EUC-JP');
+($r === FALSE) ? print("OK_OBJECT\n") : print("NG_OBJECT\n");
+$r = mb_stripos($euc_jp, $t_obj, 'BAD_ENCODING');
+($r === FALSE) ? print("OK_BAD_ENCODING\n") : print("NG_BAD_ENCODING\n");
+
+
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stripos.php.expectf
new file mode 100644
index 000000000..4d6db967c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos.php.expectf
@@ -0,0 +1,57 @@
+== POSITIVE OFFSET ==
+10
+0
+3
+0
+34
+30
+33
+30
+== NEGATIVE OFFSET ==
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+== OUT OF RANGE ==
+OK_OUT_RANGE
+OK_OUT_RANGE
+OK_OUT_RANGE
+OK_OUT_RANGE
+== NON-EXISTENT ==
+OK_STR
+OK_NEWLINE
+== NO ENCODING PARAMETER ==
+10
+0
+3
+0
+OK_STR
+OK_NEWLINE
+== NO OFFSET AND ENCODING PARAMETER ==
+10
+0
+3
+0
+OK_STR
+OK_NEWLINE
+== INVALID PARAMETER TEST ==
+ERR: Warning
+OK_NULL
+ERR: Warning
+OK_ARRAY
+ERR: Warning
+OK_OBJECT
+ERR: Warning
+OK_BAD_ENCODING
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_stripos_error1.php
new file mode 100644
index 000000000..231252bf0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_error1.php
@@ -0,0 +1,30 @@
+<?php
+/* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Test how mb_stripos behaves when passed an incorrect number of arguments
+ */
+
+echo "*** Testing mb_stripos() : error conditions ***\n";
+
+
+//Test mb_stripos with one more than the expected number of arguments
+echo "\n-- Testing mb_stripos() function with more than expected no. of arguments --\n";
+$haystack = b'string_val';
+$needle = b'string_val';
+$offset = 10;
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_stripos($haystack, $needle, $offset, $encoding, $extra_arg) );
+
+// Testing mb_stripos with one less than the expected number of arguments
+echo "\n-- Testing mb_stripos() function with less than expected no. of arguments --\n";
+$haystack = b'string_val';
+var_dump( mb_stripos($haystack) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stripos_error1.php.expectf
new file mode 100644
index 000000000..b121e1fa8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_stripos() : error conditions ***
+
+-- Testing mb_stripos() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_stripos() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_error2.php b/hphp/test/zend/bad/ext-mbstring/mb_stripos_error2.php
new file mode 100644
index 000000000..e6929c40f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_error2.php
@@ -0,0 +1,21 @@
+<?php
+/* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Pass an unknown encoding to mb_stripos() to test behaviour
+ */
+
+echo "*** Testing mb_stripos() : error conditions ***\n";
+$haystack = b'Hello, world';
+$needle = b'world';
+$offset = 2;
+$encoding = 'unknown-encoding';
+
+var_dump( mb_stripos($haystack, $needle, $offset, $encoding) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_error2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stripos_error2.php.expectf
new file mode 100644
index 000000000..295b289d0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_error2.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_stripos() : error conditions ***
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation1.php
new file mode 100644
index 000000000..28cdbecb2
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation1.php
@@ -0,0 +1,98 @@
+<?php
+/* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Pass mb_stripos different data types as $haystack arg to test behaviour
+ */
+
+echo "*** Testing mb_stripos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$needle = b'string_val';
+$offset = 0;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $haystack argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_stripos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_stripos($input, $needle, $offset, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation1.php.expectf
new file mode 100644
index 000000000..d123169b3
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation1.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_stripos() : usage variations ***
+
+-- Iteration 1 --
+bool(false)
+
+-- Iteration 2 --
+bool(false)
+
+-- Iteration 3 --
+bool(false)
+
+-- Iteration 4 --
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+bool(false)
+
+-- Iteration 7 --
+bool(false)
+
+-- Iteration 8 --
+bool(false)
+
+-- Iteration 9 --
+bool(false)
+
+-- Iteration 10 --
+bool(false)
+
+-- Iteration 11 --
+bool(false)
+
+-- Iteration 12 --
+bool(false)
+
+-- Iteration 13 --
+bool(false)
+
+-- Iteration 14 --
+bool(false)
+
+-- Iteration 15 --
+bool(false)
+
+-- Iteration 16 --
+bool(false)
+
+-- Iteration 17 --
+bool(false)
+
+-- Iteration 18 --
+bool(false)
+
+-- Iteration 19 --
+bool(false)
+
+-- Iteration 20 --
+bool(false)
+
+-- Iteration 21 --
+bool(false)
+
+-- Iteration 22 --
+bool(false)
+
+-- Iteration 23 --
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation2.php
new file mode 100644
index 000000000..2314367f7
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation2.php
@@ -0,0 +1,98 @@
+<?php
+/* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Pass mb_stripos different data types as $needle arg to test behaviour
+ */
+
+echo "*** Testing mb_stripos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$haystack = b'string_val';
+$offset = 0;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $needle argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ b"string",
+       b'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_stripos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_stripos($haystack, $input, $offset, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation2.php.expectf
new file mode 100644
index 000000000..b55ec52ae
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation2.php.expectf
@@ -0,0 +1,83 @@
+*** Testing mb_stripos() : usage variations ***
+
+-- Iteration 1 --
+bool(false)
+
+-- Iteration 2 --
+bool(false)
+
+-- Iteration 3 --
+bool(false)
+
+-- Iteration 4 --
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+bool(false)
+
+-- Iteration 7 --
+bool(false)
+
+-- Iteration 8 --
+bool(false)
+
+-- Iteration 9 --
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+int(0)
+
+-- Iteration 19 --
+int(0)
+
+-- Iteration 20 --
+bool(false)
+
+-- Iteration 21 --
+bool(false)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation3.php
new file mode 100644
index 000000000..77d78fc3b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation3.php
@@ -0,0 +1,98 @@
+<?php
+/* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Pass mb_stripos different data types as $offset arg to test behaviour
+ */
+
+echo "*** Testing mb_stripos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$needle = b'A';
+$haystack = b'string_val';
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $offest argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_stripos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_stripos($haystack, $needle, $input, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation3.php.expectf
new file mode 100644
index 000000000..207505da6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation3.php.expectf
@@ -0,0 +1,85 @@
+*** Testing mb_stripos() : usage variations ***
+
+-- Iteration 1 --
+int(8)
+
+-- Iteration 2 --
+int(8)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+int(8)
+
+-- Iteration 9 --
+int(8)
+
+-- Iteration 10 --
+int(8)
+
+-- Iteration 11 --
+int(8)
+
+-- Iteration 12 --
+int(8)
+
+-- Iteration 13 --
+int(8)
+
+-- Iteration 14 --
+int(8)
+
+-- Iteration 15 --
+int(8)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 19 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 20 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 21 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 22 --
+int(8)
+
+-- Iteration 23 --
+int(8)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation4.php b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation4.php
new file mode 100644
index 000000000..7a5fbac78
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation4.php
@@ -0,0 +1,99 @@
+<?php
+/* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Pass mb_stripos different data types as $encoding arg to test behaviour
+ * Where possible 'UTF-8' has been entered as a string value
+ */
+
+echo "*** Testing mb_stripos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$haystack = b'string_val';
+$needle = b'VaL';
+$offset = 0;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $input argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_stripos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_stripos($haystack, $needle, $offset, $input));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation4.php.expectf
new file mode 100644
index 000000000..6d73abfa7
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stripos_variation4.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_stripos() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+int(7)
+
+-- Iteration 19 --
+int(7)
+
+-- Iteration 20 --
+int(7)
+
+-- Iteration 21 --
+int(7)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stristr_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_stristr_error1.php
new file mode 100644
index 000000000..2f185a4ce
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stristr_error1.php
@@ -0,0 +1,26 @@
+<?php
+/* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_stristr() : error conditions ***\n";
+
+
+//Test mb_stristr with one more than the expected number of arguments
+echo "\n-- Testing mb_stristr() function with more than expected no. of arguments --\n";
+$haystack = b'string_val';
+$needle = b'string_val';
+$part = true;
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_stristr($haystack, $needle, $part, $encoding, $extra_arg) );
+
+// Testing mb_stristr with one less than the expected number of arguments
+echo "\n-- Testing mb_stristr() function with less than expected no. of arguments --\n";
+$haystack = b'string_val';
+var_dump( mb_stristr($haystack) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stristr_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stristr_error1.php.expectf
new file mode 100644
index 000000000..43700a87c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stristr_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_stristr() : error conditions ***
+
+-- Testing mb_stristr() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_stristr() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation1.php
new file mode 100644
index 000000000..d315e6dcf
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation1.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_stristr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$needle = b'string_val';
+$part = true;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for haystack
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_stristr($value, $needle, $part, $encoding) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation1.php.expectf
new file mode 100644
index 000000000..e37a3d55d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation1.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mb_stristr() : usage variation ***
+
+--int 0--
+bool(false)
+
+--int 1--
+bool(false)
+
+--int 12345--
+bool(false)
+
+--int -12345--
+bool(false)
+
+--float 10.5--
+bool(false)
+
+--float -10.5--
+bool(false)
+
+--float 12.3456789000e10--
+bool(false)
+
+--float -12.3456789000e10--
+bool(false)
+
+--float .5--
+bool(false)
+
+--empty array--
+Error: 2 - mb_stristr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_stristr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_stristr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_stristr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+bool(false)
+
+--lowercase null--
+bool(false)
+
+--lowercase true--
+bool(false)
+
+--lowercase false--
+bool(false)
+
+--uppercase TRUE--
+bool(false)
+
+--uppercase FALSE--
+bool(false)
+
+--empty string DQ--
+bool(false)
+
+--empty string SQ--
+bool(false)
+
+--instance of classWithToString--
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_stristr() expects parameter 1 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+bool(false)
+
+--unset var--
+bool(false)
+
+--resource--
+Error: 2 - mb_stristr() expects parameter 1 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation2.php
new file mode 100644
index 000000000..278f045b2
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation2.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_stristr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$part = true;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for needle
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_stristr($haystack, $value, $part, $encoding) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation2.php.expectf
new file mode 100644
index 000000000..41949d97d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation2.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_stristr() : usage variation ***
+
+--int 0--
+bool(false)
+
+--int 1--
+bool(false)
+
+--int 12345--
+bool(false)
+
+--int -12345--
+bool(false)
+
+--float 10.5--
+bool(false)
+
+--float -10.5--
+bool(false)
+
+--float 12.3456789000e10--
+bool(false)
+
+--float -12.3456789000e10--
+bool(false)
+
+--float .5--
+bool(false)
+
+--empty array--
+Error: 2 - mb_stristr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_stristr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_stristr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_stristr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
+bool(false)
+
+--lowercase true--
+bool(false)
+
+--lowercase false--
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
+bool(false)
+
+--uppercase TRUE--
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
+bool(false)
+
+--instance of classWithToString--
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_stristr() expects parameter 2 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mb_stristr(): Empty delimiter, %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mb_stristr() expects parameter 2 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation3.php
new file mode 100644
index 000000000..16f4818eb
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation3.php
@@ -0,0 +1,124 @@
+<?php
+/* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+ 
+echo "*** Testing mb_stristr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$needle = b'_';
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for part
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      $res = mb_stristr($haystack, $needle, $value, $encoding);
+      if ($res === false) {
+         var_dump($res);
+      }
+      else {
+         var_dump(bin2hex($res));
+      }
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation3.php.expectf
new file mode 100644
index 000000000..9ada90d85
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation3.php.expectf
@@ -0,0 +1,99 @@
+*** Testing mb_stristr() : usage variation ***
+
+--int 0--
+string(8) "5f76616c"
+
+--int 1--
+string(12) "737472696e67"
+
+--int 12345--
+string(12) "737472696e67"
+
+--int -12345--
+string(12) "737472696e67"
+
+--float 10.5--
+string(12) "737472696e67"
+
+--float -10.5--
+string(12) "737472696e67"
+
+--float 12.3456789000e10--
+string(12) "737472696e67"
+
+--float -12.3456789000e10--
+string(12) "737472696e67"
+
+--float .5--
+string(12) "737472696e67"
+
+--empty array--
+Error: 2 - mb_stristr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_stristr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_stristr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_stristr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+string(8) "5f76616c"
+
+--lowercase null--
+string(8) "5f76616c"
+
+--lowercase true--
+string(12) "737472696e67"
+
+--lowercase false--
+string(8) "5f76616c"
+
+--uppercase TRUE--
+string(12) "737472696e67"
+
+--uppercase FALSE--
+string(8) "5f76616c"
+
+--empty string DQ--
+string(8) "5f76616c"
+
+--empty string SQ--
+string(8) "5f76616c"
+
+--string DQ--
+string(12) "737472696e67"
+
+--string SQ--
+string(12) "737472696e67"
+
+--mixed case string--
+string(12) "737472696e67"
+
+--heredoc--
+string(12) "737472696e67"
+
+--instance of classWithToString--
+Error: 2 - mb_stristr() expects parameter 3 to be boolean, object given, %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_stristr() expects parameter 3 to be boolean, object given, %s(%d)
+bool(false)
+
+--undefined var--
+string(8) "5f76616c"
+
+--unset var--
+string(8) "5f76616c"
+
+--resource--
+Error: 2 - mb_stristr() expects parameter 3 to be boolean, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation4.php b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation4.php
new file mode 100644
index 000000000..537da23ff
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation4.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_stristr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$needle = b'_';
+$part = true;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "invalid";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+utf-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for encoding
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_stristr($haystack, $needle, $part, $value) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation4.php.expectf
new file mode 100644
index 000000000..6fe67874a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_stristr_variation4.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mb_stristr() : usage variation ***
+
+--int 0--
+Error: 2 - mb_stristr(): Unknown encoding "0", %s(%d)
+bool(false)
+
+--int 1--
+Error: 2 - mb_stristr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--int 12345--
+Error: 2 - mb_stristr(): Unknown encoding "12345", %s(%d)
+bool(false)
+
+--int -12345--
+Error: 2 - mb_stristr(): Unknown encoding "-2345", %s(%d)
+bool(false)
+
+--float 10.5--
+Error: 2 - mb_stristr(): Unknown encoding "10.5", %s(%d)
+bool(false)
+
+--float -10.5--
+Error: 2 - mb_stristr(): Unknown encoding "-10.5", %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mb_stristr(): Unknown encoding "123456789000", %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mb_stristr(): Unknown encoding "-123456789000", %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mb_stristr(): Unknown encoding "0.5", %s(%d)
+bool(false)
+
+--empty array--
+Error: 2 - mb_stristr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_stristr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_stristr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_stristr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+Error: 2 - mb_stristr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mb_stristr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--lowercase true--
+Error: 2 - mb_stristr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--lowercase false--
+Error: 2 - mb_stristr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--uppercase TRUE--
+Error: 2 - mb_stristr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mb_stristr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mb_stristr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mb_stristr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 2 - mb_stristr(): Unknown encoding "invalid", %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_stristr() expects parameter 4 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+Error: 2 - mb_stristr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mb_stristr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mb_stristr() expects parameter 4 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strlen_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_strlen_error1.php
new file mode 100644
index 000000000..ed4f45258
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strlen_error1.php
@@ -0,0 +1,25 @@
+<?php
+/* Prototype  : int mb_strlen(string $str [, string $encoding])
+ * Description: Get character numbers of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strlen an incorrect number of arguments to test behaviour
+ */
+
+echo "*** Testing mb_strlen() : error conditions ***\n";
+
+// Zero arguments
+echo "\n-- Testing mb_strlen() function with Zero arguments --\n";
+var_dump( mb_strlen() );
+
+//Test mb_strlen with one more than the expected number of arguments
+echo "\n-- Testing mb_strlen() function with more than expected no. of arguments --\n";
+$str = 'string_val';
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_strlen($str, $encoding, $extra_arg) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strlen_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strlen_error1.php.expectf
new file mode 100644
index 000000000..3dd787981
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strlen_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strlen() : error conditions ***
+
+-- Testing mb_strlen() function with Zero arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_strlen() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation1.php
new file mode 100644
index 000000000..8b7357ef0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation1.php
@@ -0,0 +1,95 @@
+<?php
+/* Prototype  : int mb_strlen(string $str [, string $encoding])
+ * Description: Get character numbers of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test mb_strlen by passing different data types as $str argument
+ */
+
+echo "*** Testing mb_strlen() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return b"Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $str argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ b"string",
+       b'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strlen()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strlen($input, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation1.php.expectf
new file mode 100644
index 000000000..c26ddc994
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation1.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_strlen() : usage variations ***
+
+-- Iteration 1 --
+int(1)
+
+-- Iteration 2 --
+int(1)
+
+-- Iteration 3 --
+int(5)
+
+-- Iteration 4 --
+int(5)
+
+-- Iteration 5 --
+int(4)
+
+-- Iteration 6 --
+int(5)
+
+-- Iteration 7 --
+int(12)
+
+-- Iteration 8 --
+int(13)
+
+-- Iteration 9 --
+int(3)
+
+-- Iteration 10 --
+int(0)
+
+-- Iteration 11 --
+int(0)
+
+-- Iteration 12 --
+int(1)
+
+-- Iteration 13 --
+int(0)
+
+-- Iteration 14 --
+int(1)
+
+-- Iteration 15 --
+int(0)
+
+-- Iteration 16 --
+int(0)
+
+-- Iteration 17 --
+int(0)
+
+-- Iteration 18 --
+int(6)
+
+-- Iteration 19 --
+int(6)
+
+-- Iteration 20 --
+int(11)
+
+-- Iteration 21 --
+int(14)
+
+-- Iteration 22 --
+int(0)
+
+-- Iteration 23 --
+int(0)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation2.php
new file mode 100644
index 000000000..1608e76ce
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation2.php
@@ -0,0 +1,96 @@
+<?php
+/* Prototype  : int mb_strlen(string $str [, string $encoding])
+ * Description: Get character numbers of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test mb_strlen() by passing different data types as $encoding argument.
+ * Where possible 'UTF-8' has been entered as a string value
+ */
+
+echo "*** Testing mb_strlen() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$str = 'string value';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $input argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strlen()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strlen($str, $input));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation2.php.expectf
new file mode 100644
index 000000000..063ccf12d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strlen_variation2.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_strlen() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+int(12)
+
+-- Iteration 19 --
+int(12)
+
+-- Iteration 20 --
+int(12)
+
+-- Iteration 21 --
+int(12)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos.php b/hphp/test/zend/bad/ext-mbstring/mb_strpos.php
new file mode 100644
index 000000000..10de73339
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos.php
@@ -0,0 +1,110 @@
+<?php
+// TODO: Add more encodings
+
+//$debug=true;
+ini_set('include_path','.');
+include_once('common.inc');
+
+
+// Test string
+$euc_jp = b'0123この文字列は日本語です。EUC-JPを使っています。0123日本語は面倒臭い。';
+
+// EUC-JP - With encoding parameter
+mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n");
+
+echo  "== POSITIVE OFFSET ==\n";
+print  mb_strpos($euc_jp, b'日本語', 0, 'EUC-JP') . "\n";
+print  mb_strpos($euc_jp, b'0', 0,     'EUC-JP') . "\n";
+print  mb_strpos($euc_jp, 3, 0,       'EUC-JP') . "\n";
+print  mb_strpos($euc_jp, 0, 0,       'EUC-JP') . "\n";
+print  mb_strpos($euc_jp, b'日本語', 15, 'EUC-JP') . "\n";
+print  mb_strpos($euc_jp, b'0', 15,     'EUC-JP') . "\n";
+print  mb_strpos($euc_jp, 3, 15,       'EUC-JP') . "\n";
+print  mb_strpos($euc_jp, 0, 15,       'EUC-JP') . "\n";
+
+// Negative offset
+// Note: PHP Warning - offset is negative.
+// Note: For offset(-15). It does not return position of latter string. (ie the same result as -50)
+echo "== NEGATIVE OFFSET ==\n";
+$r = mb_strpos($euc_jp, b'日本語', -15, 'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_strpos($euc_jp, b'0', -15,     'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_strpos($euc_jp, 3, -15,       'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_strpos($euc_jp, 0, -15,       'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_strpos($euc_jp, b'日本語', -50, 'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_strpos($euc_jp, b'0', -50,     'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_strpos($euc_jp, 3, -50,       'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+$r = mb_strpos($euc_jp, 0, -50,       'EUC-JP');
+($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
+
+// Out of range - should return false
+print ("== OUT OF RANGE ==\n");
+$r =  mb_strpos($euc_jp, b'日本語', 40, 'EUC-JP');
+($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
+$r =  mb_strpos($euc_jp, b'0', 40,     'EUC-JP');
+($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
+$r =  mb_strpos($euc_jp, 3, 40,       'EUC-JP');
+($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
+$r =   mb_strpos($euc_jp, 0, 40,       'EUC-JP');
+($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
+// Note: Returned NULL string
+// echo gettype($r). ' val '. $r ."\n"; 
+
+
+// Non-existent
+echo "== NON-EXISTENT ==\n";
+$r = mb_strpos($euc_jp, b'韓国語', 0, 'EUC-JP');
+($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
+$r = mb_strpos($euc_jp, b"\n",     0, 'EUC-JP');
+($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
+
+
+// EUC-JP - No encoding parameter
+echo "== NO ENCODING PARAMETER ==\n";
+mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
+
+print  mb_strpos($euc_jp, b'日本語', 0) . "\n";
+print  mb_strpos($euc_jp, b'0', 0) . "\n";
+print  mb_strpos($euc_jp, 3, 0) . "\n";
+print  mb_strpos($euc_jp, 0, 0) . "\n";
+
+$r = mb_strpos($euc_jp, b'韓国語', 0);
+($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
+$r = mb_strpos($euc_jp, b"\n", 0);
+($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
+
+// EUC-JP - No offset and encoding parameter
+echo "== NO OFFSET AND ENCODING PARAMETER ==\n";
+mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
+
+print  mb_strpos($euc_jp, b'日本語') . "\n";
+print  mb_strpos($euc_jp, b'0') . "\n";
+print  mb_strpos($euc_jp, 3) . "\n";
+print  mb_strpos($euc_jp, 0) . "\n";
+
+$r = mb_strpos($euc_jp, b'韓国語');
+($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
+$r = mb_strpos($euc_jp, b"\n");
+($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
+
+
+// Invalid Parameters
+echo "== INVALID PARAMETER TEST ==\n";
+
+$r = mb_strpos($euc_jp,'','EUC-JP');
+($r === FALSE) ? print("OK_NULL\n") : print("NG_NULL\n");
+$r = mb_strpos($euc_jp, $t_ary, 'EUC-JP');
+($r === FALSE) ? print("OK_ARRAY\n") : print("NG_ARRAY\n");
+$r = mb_strpos($euc_jp, $t_obj, 'EUC-JP');
+($r === FALSE) ? print("OK_OBJECT\n") : print("NG_OBJECT\n");
+$r = mb_strpos($euc_jp, $t_obj, 'BAD_ENCODING');
+($r === FALSE) ? print("OK_BAD_ENCODING\n") : print("NG_BAD_ENCODING\n");
+
+
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strpos.php.expectf
new file mode 100644
index 000000000..4d6db967c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos.php.expectf
@@ -0,0 +1,57 @@
+== POSITIVE OFFSET ==
+10
+0
+3
+0
+34
+30
+33
+30
+== NEGATIVE OFFSET ==
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+== OUT OF RANGE ==
+OK_OUT_RANGE
+OK_OUT_RANGE
+OK_OUT_RANGE
+OK_OUT_RANGE
+== NON-EXISTENT ==
+OK_STR
+OK_NEWLINE
+== NO ENCODING PARAMETER ==
+10
+0
+3
+0
+OK_STR
+OK_NEWLINE
+== NO OFFSET AND ENCODING PARAMETER ==
+10
+0
+3
+0
+OK_STR
+OK_NEWLINE
+== INVALID PARAMETER TEST ==
+ERR: Warning
+OK_NULL
+ERR: Warning
+OK_ARRAY
+ERR: Warning
+OK_OBJECT
+ERR: Warning
+OK_BAD_ENCODING
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_strpos_error1.php
new file mode 100644
index 000000000..8895f0927
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos_error1.php
@@ -0,0 +1,29 @@
+<?php
+/* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test how mb_strpos behaves when passed an incorrect number of arguments
+ */
+
+echo "*** Testing mb_strpos() : error conditions ***\n";
+
+
+//Test mb_strpos with one more than the expected number of arguments
+echo "\n-- Testing mb_strpos() function with more than expected no. of arguments --\n";
+$haystack = 'string_val';
+$needle = 'string_val';
+$offset = 10;
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_strpos($haystack, $needle, $offset, $encoding, $extra_arg) );
+
+// Testing mb_strpos with one less than the expected number of arguments
+echo "\n-- Testing mb_strpos() function with less than expected no. of arguments --\n";
+$haystack = 'string_val';
+var_dump( mb_strpos($haystack) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strpos_error1.php.expectf
new file mode 100644
index 000000000..dd91b04c6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strpos() : error conditions ***
+
+-- Testing mb_strpos() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_strpos() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation1.php
new file mode 100644
index 000000000..f7edbb5e8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation1.php
@@ -0,0 +1,97 @@
+<?php
+/* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strpos different data types as $haystack arg to test behaviour
+ */
+
+echo "*** Testing mb_strpos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$needle = 'string_val';
+$offset = 0;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $haystack argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strpos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strpos($input, $needle, $offset, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation1.php.expectf
new file mode 100644
index 000000000..936fab656
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation1.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_strpos() : usage variations ***
+
+-- Iteration 1 --
+bool(false)
+
+-- Iteration 2 --
+bool(false)
+
+-- Iteration 3 --
+bool(false)
+
+-- Iteration 4 --
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+bool(false)
+
+-- Iteration 7 --
+bool(false)
+
+-- Iteration 8 --
+bool(false)
+
+-- Iteration 9 --
+bool(false)
+
+-- Iteration 10 --
+bool(false)
+
+-- Iteration 11 --
+bool(false)
+
+-- Iteration 12 --
+bool(false)
+
+-- Iteration 13 --
+bool(false)
+
+-- Iteration 14 --
+bool(false)
+
+-- Iteration 15 --
+bool(false)
+
+-- Iteration 16 --
+bool(false)
+
+-- Iteration 17 --
+bool(false)
+
+-- Iteration 18 --
+bool(false)
+
+-- Iteration 19 --
+bool(false)
+
+-- Iteration 20 --
+bool(false)
+
+-- Iteration 21 --
+bool(false)
+
+-- Iteration 22 --
+bool(false)
+
+-- Iteration 23 --
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation2.php
new file mode 100644
index 000000000..3642f2cb6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation2.php
@@ -0,0 +1,97 @@
+<?php
+/* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strpos different data types as $needle arg to test behaviour
+ */
+
+echo "*** Testing mb_strpos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$haystack = b'string_val';
+$offset = 0;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return b"Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $needle argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ b"string",
+       b'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strpos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strpos($haystack, $input, $offset, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation2.php.expectf
new file mode 100644
index 000000000..e656f056f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation2.php.expectf
@@ -0,0 +1,83 @@
+*** Testing mb_strpos() : usage variations ***
+
+-- Iteration 1 --
+bool(false)
+
+-- Iteration 2 --
+bool(false)
+
+-- Iteration 3 --
+bool(false)
+
+-- Iteration 4 --
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+bool(false)
+
+-- Iteration 7 --
+bool(false)
+
+-- Iteration 8 --
+bool(false)
+
+-- Iteration 9 --
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+int(0)
+
+-- Iteration 19 --
+int(0)
+
+-- Iteration 20 --
+bool(false)
+
+-- Iteration 21 --
+bool(false)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation3.php
new file mode 100644
index 000000000..ce9c80830
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation3.php
@@ -0,0 +1,97 @@
+<?php
+/* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strpos different data types as $offset arg to test behaviour
+ */
+
+echo "*** Testing mb_strpos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$needle = b'a';
+$haystack = b'string_val';
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $offest argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strpos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strpos($haystack, $needle, $input, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation3.php.expectf
new file mode 100644
index 000000000..151641787
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation3.php.expectf
@@ -0,0 +1,85 @@
+*** Testing mb_strpos() : usage variations ***
+
+-- Iteration 1 --
+int(8)
+
+-- Iteration 2 --
+int(8)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+int(8)
+
+-- Iteration 9 --
+int(8)
+
+-- Iteration 10 --
+int(8)
+
+-- Iteration 11 --
+int(8)
+
+-- Iteration 12 --
+int(8)
+
+-- Iteration 13 --
+int(8)
+
+-- Iteration 14 --
+int(8)
+
+-- Iteration 15 --
+int(8)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 19 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 20 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 21 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 22 --
+int(8)
+
+-- Iteration 23 --
+int(8)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation4.php b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation4.php
new file mode 100644
index 000000000..3892467df
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation4.php
@@ -0,0 +1,98 @@
+<?php
+/* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strpos different data types as $encoding arg to test behaviour
+ * Where possible 'UTF-8' has been entered as a string value
+ */
+
+echo "*** Testing mb_strpos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$haystack = b'string_val';
+$needle = b'val';
+$offset = 0;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $input argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strpos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strpos($haystack, $needle, $offset, $input));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation4.php.expectf
new file mode 100644
index 000000000..23eb71200
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strpos_variation4.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_strpos() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+int(7)
+
+-- Iteration 19 --
+int(7)
+
+-- Iteration 20 --
+int(7)
+
+-- Iteration 21 --
+int(7)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrchr_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_error1.php
new file mode 100644
index 000000000..d21f381ab
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_error1.php
@@ -0,0 +1,26 @@
+<?php
+/* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrchr() : error conditions ***\n";
+
+
+//Test mb_strrchr with one more than the expected number of arguments
+echo "\n-- Testing mb_strrchr() function with more than expected no. of arguments --\n";
+$haystack = b'string_val';
+$needle = b'string_val';
+$part = true;
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_strrchr($haystack, $needle, $part, $encoding, $extra_arg) );
+
+// Testing mb_strrchr with one less than the expected number of arguments
+echo "\n-- Testing mb_strrchr() function with less than expected no. of arguments --\n";
+$haystack = b'string_val';
+var_dump( mb_strrchr($haystack) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrchr_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_error1.php.expectf
new file mode 100644
index 000000000..90c6ef62b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strrchr() : error conditions ***
+
+-- Testing mb_strrchr() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_strrchr() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation1.php
new file mode 100644
index 000000000..a540be37e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation1.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrchr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$needle = b'string_val';
+$part = true;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for haystack
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_strrchr($value, $needle, $part, $encoding) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation1.php.expectf
new file mode 100644
index 000000000..cd71c9f33
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation1.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mb_strrchr() : usage variation ***
+
+--int 0--
+bool(false)
+
+--int 1--
+bool(false)
+
+--int 12345--
+bool(false)
+
+--int -12345--
+bool(false)
+
+--float 10.5--
+bool(false)
+
+--float -10.5--
+bool(false)
+
+--float 12.3456789000e10--
+bool(false)
+
+--float -12.3456789000e10--
+bool(false)
+
+--float .5--
+bool(false)
+
+--empty array--
+Error: 2 - mb_strrchr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strrchr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strrchr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strrchr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+bool(false)
+
+--lowercase null--
+bool(false)
+
+--lowercase true--
+bool(false)
+
+--lowercase false--
+bool(false)
+
+--uppercase TRUE--
+bool(false)
+
+--uppercase FALSE--
+bool(false)
+
+--empty string DQ--
+bool(false)
+
+--empty string SQ--
+bool(false)
+
+--instance of classWithToString--
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strrchr() expects parameter 1 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+bool(false)
+
+--unset var--
+bool(false)
+
+--resource--
+Error: 2 - mb_strrchr() expects parameter 1 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation2.php
new file mode 100644
index 000000000..7f9bba335
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation2.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrchr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$part = true;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for needle
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_strrchr($haystack, $value, $part, $encoding) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation2.php.expectf
new file mode 100644
index 000000000..2d424b78b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation2.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mb_strrchr() : usage variation ***
+
+--int 0--
+bool(false)
+
+--int 1--
+bool(false)
+
+--int 12345--
+bool(false)
+
+--int -12345--
+bool(false)
+
+--float 10.5--
+bool(false)
+
+--float -10.5--
+bool(false)
+
+--float 12.3456789000e10--
+bool(false)
+
+--float -12.3456789000e10--
+bool(false)
+
+--float .5--
+bool(false)
+
+--empty array--
+Error: 2 - mb_strrchr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strrchr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strrchr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strrchr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+bool(false)
+
+--lowercase null--
+bool(false)
+
+--lowercase true--
+bool(false)
+
+--lowercase false--
+bool(false)
+
+--uppercase TRUE--
+bool(false)
+
+--uppercase FALSE--
+bool(false)
+
+--empty string DQ--
+bool(false)
+
+--empty string SQ--
+bool(false)
+
+--instance of classWithToString--
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strrchr() expects parameter 2 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+bool(false)
+
+--unset var--
+bool(false)
+
+--resource--
+Error: 2 - mb_strrchr() expects parameter 2 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation3.php
new file mode 100644
index 000000000..8a0e95be8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation3.php
@@ -0,0 +1,124 @@
+<?php
+/* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrchr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$needle = b'_';
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for part
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      $res = mb_strrchr($haystack, $needle, $value, $encoding);
+      if ($res === false) {
+         var_dump($res);
+      }
+      else {
+         var_dump(bin2hex($res));
+      }      
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation3.php.expectf
new file mode 100644
index 000000000..252bf58fb
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation3.php.expectf
@@ -0,0 +1,99 @@
+*** Testing mb_strrchr() : usage variation ***
+
+--int 0--
+string(8) "5f76616c"
+
+--int 1--
+string(12) "737472696e67"
+
+--int 12345--
+string(12) "737472696e67"
+
+--int -12345--
+string(12) "737472696e67"
+
+--float 10.5--
+string(12) "737472696e67"
+
+--float -10.5--
+string(12) "737472696e67"
+
+--float 12.3456789000e10--
+string(12) "737472696e67"
+
+--float -12.3456789000e10--
+string(12) "737472696e67"
+
+--float .5--
+string(12) "737472696e67"
+
+--empty array--
+Error: 2 - mb_strrchr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strrchr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strrchr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strrchr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+string(8) "5f76616c"
+
+--lowercase null--
+string(8) "5f76616c"
+
+--lowercase true--
+string(12) "737472696e67"
+
+--lowercase false--
+string(8) "5f76616c"
+
+--uppercase TRUE--
+string(12) "737472696e67"
+
+--uppercase FALSE--
+string(8) "5f76616c"
+
+--empty string DQ--
+string(8) "5f76616c"
+
+--empty string SQ--
+string(8) "5f76616c"
+
+--string DQ--
+string(12) "737472696e67"
+
+--string SQ--
+string(12) "737472696e67"
+
+--mixed case string--
+string(12) "737472696e67"
+
+--heredoc--
+string(12) "737472696e67"
+
+--instance of classWithToString--
+Error: 2 - mb_strrchr() expects parameter 3 to be boolean, object given, %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strrchr() expects parameter 3 to be boolean, object given, %s(%d)
+bool(false)
+
+--undefined var--
+string(8) "5f76616c"
+
+--unset var--
+string(8) "5f76616c"
+
+--resource--
+Error: 2 - mb_strrchr() expects parameter 3 to be boolean, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation4.php b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation4.php
new file mode 100644
index 000000000..cba2aa842
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation4.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrchr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$needle = b'_';
+$part = true;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "invalid";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+invalid
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for encoding
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_strrchr($haystack, $needle, $part, $value) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation4.php.expectf
new file mode 100644
index 000000000..50d056eba
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrchr_variation4.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mb_strrchr() : usage variation ***
+
+--int 0--
+Error: 2 - mb_strrchr(): Unknown encoding "0", %s(%d)
+bool(false)
+
+--int 1--
+Error: 2 - mb_strrchr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--int 12345--
+Error: 2 - mb_strrchr(): Unknown encoding "12345", %s(%d)
+bool(false)
+
+--int -12345--
+Error: 2 - mb_strrchr(): Unknown encoding "-2345", %s(%d)
+bool(false)
+
+--float 10.5--
+Error: 2 - mb_strrchr(): Unknown encoding "10.5", %s(%d)
+bool(false)
+
+--float -10.5--
+Error: 2 - mb_strrchr(): Unknown encoding "-10.5", %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mb_strrchr(): Unknown encoding "123456789000", %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mb_strrchr(): Unknown encoding "-123456789000", %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mb_strrchr(): Unknown encoding "0.5", %s(%d)
+bool(false)
+
+--empty array--
+Error: 2 - mb_strrchr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strrchr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strrchr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strrchr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+Error: 2 - mb_strrchr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mb_strrchr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--lowercase true--
+Error: 2 - mb_strrchr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--lowercase false--
+Error: 2 - mb_strrchr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--uppercase TRUE--
+Error: 2 - mb_strrchr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mb_strrchr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mb_strrchr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mb_strrchr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 2 - mb_strrchr(): Unknown encoding "invalid", %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strrchr() expects parameter 4 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+Error: 2 - mb_strrchr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mb_strrchr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mb_strrchr() expects parameter 4 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrichr_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_error1.php
new file mode 100644
index 000000000..16f9edd1e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_error1.php
@@ -0,0 +1,26 @@
+<?php
+/* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrichr() : error conditions ***\n";
+
+
+//Test mb_strrichr with one more than the expected number of arguments
+echo "\n-- Testing mb_strrichr() function with more than expected no. of arguments --\n";
+$haystack = b'string_val';
+$needle = b'string_val';
+$part = true;
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_strrichr($haystack, $needle, $part, $encoding, $extra_arg) );
+
+// Testing mb_strrichr with one less than the expected number of arguments
+echo "\n-- Testing mb_strrichr() function with less than expected no. of arguments --\n";
+$haystack = b'string_val';
+var_dump( mb_strrichr($haystack) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrichr_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_error1.php.expectf
new file mode 100644
index 000000000..873d4d1df
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strrichr() : error conditions ***
+
+-- Testing mb_strrichr() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_strrichr() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation1.php
new file mode 100644
index 000000000..edcab86ee
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation1.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrichr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$needle = b'string_val';
+$part = true;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for haystack
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_strrichr($value, $needle, $part, $encoding) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation1.php.expectf
new file mode 100644
index 000000000..13ccc75a4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation1.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mb_strrichr() : usage variation ***
+
+--int 0--
+bool(false)
+
+--int 1--
+bool(false)
+
+--int 12345--
+bool(false)
+
+--int -12345--
+bool(false)
+
+--float 10.5--
+bool(false)
+
+--float -10.5--
+bool(false)
+
+--float 12.3456789000e10--
+bool(false)
+
+--float -12.3456789000e10--
+bool(false)
+
+--float .5--
+bool(false)
+
+--empty array--
+Error: 2 - mb_strrichr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strrichr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strrichr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strrichr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+bool(false)
+
+--lowercase null--
+bool(false)
+
+--lowercase true--
+bool(false)
+
+--lowercase false--
+bool(false)
+
+--uppercase TRUE--
+bool(false)
+
+--uppercase FALSE--
+bool(false)
+
+--empty string DQ--
+bool(false)
+
+--empty string SQ--
+bool(false)
+
+--instance of classWithToString--
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strrichr() expects parameter 1 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+bool(false)
+
+--unset var--
+bool(false)
+
+--resource--
+Error: 2 - mb_strrichr() expects parameter 1 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation2.php
new file mode 100644
index 000000000..fa257a578
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation2.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrichr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$part = true;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for needle
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_strrichr($haystack, $value, $part, $encoding) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation2.php.expectf
new file mode 100644
index 000000000..2ae9e91f9
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation2.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mb_strrichr() : usage variation ***
+
+--int 0--
+bool(false)
+
+--int 1--
+bool(false)
+
+--int 12345--
+bool(false)
+
+--int -12345--
+bool(false)
+
+--float 10.5--
+bool(false)
+
+--float -10.5--
+bool(false)
+
+--float 12.3456789000e10--
+bool(false)
+
+--float -12.3456789000e10--
+bool(false)
+
+--float .5--
+bool(false)
+
+--empty array--
+Error: 2 - mb_strrichr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strrichr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strrichr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strrichr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+bool(false)
+
+--lowercase null--
+bool(false)
+
+--lowercase true--
+bool(false)
+
+--lowercase false--
+bool(false)
+
+--uppercase TRUE--
+bool(false)
+
+--uppercase FALSE--
+bool(false)
+
+--empty string DQ--
+bool(false)
+
+--empty string SQ--
+bool(false)
+
+--instance of classWithToString--
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strrichr() expects parameter 2 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+bool(false)
+
+--unset var--
+bool(false)
+
+--resource--
+Error: 2 - mb_strrichr() expects parameter 2 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation3.php
new file mode 100644
index 000000000..78eaa872a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation3.php
@@ -0,0 +1,124 @@
+<?php
+/* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+ 
+echo "*** Testing mb_strrichr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$needle = b'_';
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for part
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      $res = mb_strrichr($haystack, $needle, $value, $encoding);
+      if ($res === false) {
+         var_dump($res);
+      }
+      else {
+         var_dump(bin2hex($res));
+      }         
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation3.php.expectf
new file mode 100644
index 000000000..dd354396f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation3.php.expectf
@@ -0,0 +1,99 @@
+*** Testing mb_strrichr() : usage variation ***
+
+--int 0--
+string(8) "5f76616c"
+
+--int 1--
+string(12) "737472696e67"
+
+--int 12345--
+string(12) "737472696e67"
+
+--int -12345--
+string(12) "737472696e67"
+
+--float 10.5--
+string(12) "737472696e67"
+
+--float -10.5--
+string(12) "737472696e67"
+
+--float 12.3456789000e10--
+string(12) "737472696e67"
+
+--float -12.3456789000e10--
+string(12) "737472696e67"
+
+--float .5--
+string(12) "737472696e67"
+
+--empty array--
+Error: 2 - mb_strrichr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strrichr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strrichr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strrichr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+string(8) "5f76616c"
+
+--lowercase null--
+string(8) "5f76616c"
+
+--lowercase true--
+string(12) "737472696e67"
+
+--lowercase false--
+string(8) "5f76616c"
+
+--uppercase TRUE--
+string(12) "737472696e67"
+
+--uppercase FALSE--
+string(8) "5f76616c"
+
+--empty string DQ--
+string(8) "5f76616c"
+
+--empty string SQ--
+string(8) "5f76616c"
+
+--string DQ--
+string(12) "737472696e67"
+
+--string SQ--
+string(12) "737472696e67"
+
+--mixed case string--
+string(12) "737472696e67"
+
+--heredoc--
+string(12) "737472696e67"
+
+--instance of classWithToString--
+Error: 2 - mb_strrichr() expects parameter 3 to be boolean, object given, %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strrichr() expects parameter 3 to be boolean, object given, %s(%d)
+bool(false)
+
+--undefined var--
+string(8) "5f76616c"
+
+--unset var--
+string(8) "5f76616c"
+
+--resource--
+Error: 2 - mb_strrichr() expects parameter 3 to be boolean, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation4.php b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation4.php
new file mode 100644
index 000000000..d949457f3
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation4.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrichr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$needle = b'_';
+$part = true;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "invalid";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+invalid
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for encoding
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_strrichr($haystack, $needle, $part, $value) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation4.php.expectf
new file mode 100644
index 000000000..7577bd84f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrichr_variation4.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mb_strrichr() : usage variation ***
+
+--int 0--
+Error: 2 - mb_strrichr(): Unknown encoding "0", %s(%d)
+bool(false)
+
+--int 1--
+Error: 2 - mb_strrichr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--int 12345--
+Error: 2 - mb_strrichr(): Unknown encoding "12345", %s(%d)
+bool(false)
+
+--int -12345--
+Error: 2 - mb_strrichr(): Unknown encoding "-2345", %s(%d)
+bool(false)
+
+--float 10.5--
+Error: 2 - mb_strrichr(): Unknown encoding "10.5", %s(%d)
+bool(false)
+
+--float -10.5--
+Error: 2 - mb_strrichr(): Unknown encoding "-10.5", %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mb_strrichr(): Unknown encoding "123456789000", %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mb_strrichr(): Unknown encoding "-123456789000", %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mb_strrichr(): Unknown encoding "0.5", %s(%d)
+bool(false)
+
+--empty array--
+Error: 2 - mb_strrichr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strrichr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strrichr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strrichr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+Error: 2 - mb_strrichr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mb_strrichr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--lowercase true--
+Error: 2 - mb_strrichr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--lowercase false--
+Error: 2 - mb_strrichr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--uppercase TRUE--
+Error: 2 - mb_strrichr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mb_strrichr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mb_strrichr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mb_strrichr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 2 - mb_strrichr(): Unknown encoding "invalid", %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strrichr() expects parameter 4 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+Error: 2 - mb_strrichr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mb_strrichr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mb_strrichr() expects parameter 4 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_strripos_error1.php
new file mode 100644
index 000000000..6d240f5d8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_error1.php
@@ -0,0 +1,30 @@
+<?php
+/* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Test how mb_strripos behaves when passed an incorrect number of arguments
+ */
+
+echo "*** Testing mb_strripos() : error conditions ***\n";
+
+
+//Test mb_strripos with one more than the expected number of arguments
+echo "\n-- Testing mb_strripos() function with more than expected no. of arguments --\n";
+$haystack = b'string_val';
+$needle = b'string_val';
+$offset = 10;
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_strripos($haystack, $needle, $offset, $encoding, $extra_arg) );
+
+// Testing mb_strripos with one less than the expected number of arguments
+echo "\n-- Testing mb_strripos() function with less than expected no. of arguments --\n";
+$haystack = b'string_val';
+var_dump( mb_strripos($haystack) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strripos_error1.php.expectf
new file mode 100644
index 000000000..75d3f1538
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strripos() : error conditions ***
+
+-- Testing mb_strripos() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_strripos() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_error2.php b/hphp/test/zend/bad/ext-mbstring/mb_strripos_error2.php
new file mode 100644
index 000000000..0c913ef3f
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_error2.php
@@ -0,0 +1,21 @@
+<?php
+/* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Pass an unknown encoding to mb_strripos() to test behaviour
+ */
+
+echo "*** Testing mb_strripos() : error conditions ***\n";
+$haystack = b'Hello, world';
+$needle = b'world';
+$offset = 2;
+$encoding = 'unknown-encoding';
+
+var_dump( mb_strripos($haystack, $needle, $offset, $encoding) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_error2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strripos_error2.php.expectf
new file mode 100644
index 000000000..f732dddd6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_error2.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_strripos() : error conditions ***
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation1.php
new file mode 100644
index 000000000..2b150053c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation1.php
@@ -0,0 +1,98 @@
+<?php
+/* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Pass mb_strripos different data types as $haystack arg to test behaviour
+ */
+
+echo "*** Testing mb_strripos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$needle = b'string_val';
+$offset = 0;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return b"Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $haystack argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strripos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strripos($input, $needle, $offset, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation1.php.expectf
new file mode 100644
index 000000000..577b0c182
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation1.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_strripos() : usage variations ***
+
+-- Iteration 1 --
+bool(false)
+
+-- Iteration 2 --
+bool(false)
+
+-- Iteration 3 --
+bool(false)
+
+-- Iteration 4 --
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+bool(false)
+
+-- Iteration 7 --
+bool(false)
+
+-- Iteration 8 --
+bool(false)
+
+-- Iteration 9 --
+bool(false)
+
+-- Iteration 10 --
+bool(false)
+
+-- Iteration 11 --
+bool(false)
+
+-- Iteration 12 --
+bool(false)
+
+-- Iteration 13 --
+bool(false)
+
+-- Iteration 14 --
+bool(false)
+
+-- Iteration 15 --
+bool(false)
+
+-- Iteration 16 --
+bool(false)
+
+-- Iteration 17 --
+bool(false)
+
+-- Iteration 18 --
+bool(false)
+
+-- Iteration 19 --
+bool(false)
+
+-- Iteration 20 --
+bool(false)
+
+-- Iteration 21 --
+bool(false)
+
+-- Iteration 22 --
+bool(false)
+
+-- Iteration 23 --
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation2.php
new file mode 100644
index 000000000..d14960817
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation2.php
@@ -0,0 +1,98 @@
+<?php
+/* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Pass mb_strripos different data types as $needle arg to test behaviour
+ */
+
+echo "*** Testing mb_strripos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$haystack = b'string_val';
+$offset = 0;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return b"Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $needle argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ b"string",
+       b'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strripos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strripos($haystack, $input, $offset, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation2.php.expectf
new file mode 100644
index 000000000..d7c8ba365
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation2.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_strripos() : usage variations ***
+
+-- Iteration 1 --
+bool(false)
+
+-- Iteration 2 --
+bool(false)
+
+-- Iteration 3 --
+bool(false)
+
+-- Iteration 4 --
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+bool(false)
+
+-- Iteration 7 --
+bool(false)
+
+-- Iteration 8 --
+bool(false)
+
+-- Iteration 9 --
+bool(false)
+
+-- Iteration 10 --
+bool(false)
+
+-- Iteration 11 --
+bool(false)
+
+-- Iteration 12 --
+bool(false)
+
+-- Iteration 13 --
+bool(false)
+
+-- Iteration 14 --
+bool(false)
+
+-- Iteration 15 --
+bool(false)
+
+-- Iteration 16 --
+bool(false)
+
+-- Iteration 17 --
+bool(false)
+
+-- Iteration 18 --
+int(0)
+
+-- Iteration 19 --
+int(0)
+
+-- Iteration 20 --
+bool(false)
+
+-- Iteration 21 --
+bool(false)
+
+-- Iteration 22 --
+bool(false)
+
+-- Iteration 23 --
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation3_Bug45923.php b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation3_Bug45923.php
new file mode 100644
index 000000000..a3721282e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation3_Bug45923.php
@@ -0,0 +1,98 @@
+<?php
+/* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Pass mb_strripos different data types as $offset arg to test behaviour
+ */
+
+echo "*** Testing mb_strripos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$needle = b'A';
+$haystack = b'string_val';
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return b"Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $offest argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  12.5,
+       -12.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ b"string",
+       b'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strripos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strripos($haystack, $needle, $input, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation3_Bug45923.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation3_Bug45923.php.expectf
new file mode 100644
index 000000000..593f2ca1a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation3_Bug45923.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mb_strripos() : usage variations ***
+
+-- Iteration 1 --
+int(8)
+
+-- Iteration 2 --
+int(8)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+int(8)
+
+-- Iteration 9 --
+int(8)
+
+-- Iteration 10 --
+int(8)
+
+-- Iteration 11 --
+int(8)
+
+-- Iteration 12 --
+int(8)
+
+-- Iteration 13 --
+int(8)
+
+-- Iteration 14 --
+int(8)
+
+-- Iteration 15 --
+int(8)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 19 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 20 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 21 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 22 --
+int(8)
+
+-- Iteration 23 --
+int(8)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation4.php b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation4.php
new file mode 100644
index 000000000..add451ba6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation4.php
@@ -0,0 +1,99 @@
+<?php
+/* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Pass mb_strripos different data types as $encoding arg to test behaviour
+ * Where possible 'UTF-8' has been entered as a string value
+ */
+
+echo "*** Testing mb_strripos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$haystack = b'string_val';
+$needle = b'VaL';
+$offset = 0;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $input argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strripos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strripos($haystack, $needle, $offset, $input));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation4.php.expectf
new file mode 100644
index 000000000..cff84a71d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strripos_variation4.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_strripos() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+int(7)
+
+-- Iteration 19 --
+int(7)
+
+-- Iteration 20 --
+int(7)
+
+-- Iteration 21 --
+int(7)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error1.php
new file mode 100644
index 000000000..7ecc54266
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error1.php
@@ -0,0 +1,29 @@
+<?php
+/* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of last occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strrpos() an incorrect number of arguments
+ */
+
+echo "*** Testing mb_strrpos() : error conditions ***\n";
+
+
+//Test mb_strrpos with one more than the expected number of arguments
+echo "\n-- Testing mb_strrpos() function with more than expected no. of arguments --\n";
+$haystack = 'string_val';
+$needle = 'string_val';
+$offset = 10;
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_strrpos($haystack, $needle, $offset, $encoding, $extra_arg) );
+
+// Testing mb_strrpos with one less than the expected number of arguments
+echo "\n-- Testing mb_strrpos() function with less than expected no. of arguments --\n";
+$haystack = 'string_val';
+var_dump( mb_strrpos($haystack) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error1.php.expectf
new file mode 100644
index 000000000..06919d824
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strrpos() : error conditions ***
+
+-- Testing mb_strrpos() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_strrpos() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error2.php b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error2.php
new file mode 100644
index 000000000..ae1bdbf68
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error2.php
@@ -0,0 +1,21 @@
+<?php
+/* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of last occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strrpos() an encoding that doesn't exist
+ */
+
+echo "*** Testing mb_strrpos() : error conditions ***\n";
+
+$haystack = 'This is an English string. 0123456789.';
+$needle = '123';
+$offset = 5;
+$encoding = 'unknown-encoding';
+
+var_dump(mb_strrpos($haystack, $needle , $offset, $encoding));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error2.php.expectf
new file mode 100644
index 000000000..4a4bc9cd6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_error2.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_strrpos() : error conditions ***
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation1.php
new file mode 100644
index 000000000..b6f08f010
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation1.php
@@ -0,0 +1,95 @@
+<?php
+/* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of last occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strrpos() different data types as $haystack argument to test behaviour
+ */
+
+echo "*** Testing mb_strrpos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$needle = b'world';
+$offset = 0;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return b"hello, world";
+  }
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello, world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $haystack argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ b"hello, world",
+       b'hello, world',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strrpos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strrpos($input, $needle, $offset, $encoding));
+  $iterator++;
+};
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation1.php.expectf
new file mode 100644
index 000000000..85f769ab0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation1.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_strrpos() : usage variations ***
+
+-- Iteration 1 --
+bool(false)
+
+-- Iteration 2 --
+bool(false)
+
+-- Iteration 3 --
+bool(false)
+
+-- Iteration 4 --
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+bool(false)
+
+-- Iteration 7 --
+bool(false)
+
+-- Iteration 8 --
+bool(false)
+
+-- Iteration 9 --
+bool(false)
+
+-- Iteration 10 --
+bool(false)
+
+-- Iteration 11 --
+bool(false)
+
+-- Iteration 12 --
+bool(false)
+
+-- Iteration 13 --
+bool(false)
+
+-- Iteration 14 --
+bool(false)
+
+-- Iteration 15 --
+bool(false)
+
+-- Iteration 16 --
+bool(false)
+
+-- Iteration 17 --
+bool(false)
+
+-- Iteration 18 --
+int(7)
+
+-- Iteration 19 --
+int(7)
+
+-- Iteration 20 --
+int(7)
+
+-- Iteration 21 --
+int(7)
+
+-- Iteration 22 --
+bool(false)
+
+-- Iteration 23 --
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation2.php
new file mode 100644
index 000000000..217a0bd34
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation2.php
@@ -0,0 +1,97 @@
+<?php
+/* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of last occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strrpos() different data types as $needle argument to test behaviour
+ */
+
+echo "*** Testing mb_strrpos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$haystack = 'hello, world';
+$offset = 0;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "world";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $needle argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "world",
+       'world',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strrpos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strrpos($haystack, $input, $offset, $encoding));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation2.php.expectf
new file mode 100644
index 000000000..85f769ab0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation2.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_strrpos() : usage variations ***
+
+-- Iteration 1 --
+bool(false)
+
+-- Iteration 2 --
+bool(false)
+
+-- Iteration 3 --
+bool(false)
+
+-- Iteration 4 --
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+bool(false)
+
+-- Iteration 7 --
+bool(false)
+
+-- Iteration 8 --
+bool(false)
+
+-- Iteration 9 --
+bool(false)
+
+-- Iteration 10 --
+bool(false)
+
+-- Iteration 11 --
+bool(false)
+
+-- Iteration 12 --
+bool(false)
+
+-- Iteration 13 --
+bool(false)
+
+-- Iteration 14 --
+bool(false)
+
+-- Iteration 15 --
+bool(false)
+
+-- Iteration 16 --
+bool(false)
+
+-- Iteration 17 --
+bool(false)
+
+-- Iteration 18 --
+int(7)
+
+-- Iteration 19 --
+int(7)
+
+-- Iteration 20 --
+int(7)
+
+-- Iteration 21 --
+int(7)
+
+-- Iteration 22 --
+bool(false)
+
+-- Iteration 23 --
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation3.php
new file mode 100644
index 000000000..067ac9845
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation3.php
@@ -0,0 +1,80 @@
+<?php
+/* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of last occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strrpos() different data types as $offset argument to test behaviour
+ */
+
+echo "*** Testing mb_strrpos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$needle = b'a';
+$haystack = b'string_val';
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return b"7";
+  }
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// unexpected values to be passed to $offset argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // object data
+/*16*/ new classA(),
+
+       // undefined data
+/*17*/ @$undefined_var,
+
+       // unset data
+/*18*/ @$unset_var
+);
+
+// loop through each element of $inputs to check the behavior of mb_strrpos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strrpos($haystack, $needle, $input, $encoding));
+  $iterator++;
+};
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation3.php.expectf
new file mode 100644
index 000000000..2f099024c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation3.php.expectf
@@ -0,0 +1,60 @@
+*** Testing mb_strrpos() : usage variations ***
+
+-- Iteration 1 --
+int(8)
+
+-- Iteration 2 --
+int(8)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+int(8)
+
+-- Iteration 9 --
+int(8)
+
+-- Iteration 10 --
+int(8)
+
+-- Iteration 11 --
+int(8)
+
+-- Iteration 12 --
+int(8)
+
+-- Iteration 13 --
+int(8)
+
+-- Iteration 14 --
+int(8)
+
+-- Iteration 15 --
+int(8)
+
+-- Iteration 16 --
+HipHop Notice: %a
+int(8)
+
+-- Iteration 17 --
+int(8)
+
+-- Iteration 18 --
+int(8)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation4.php b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation4.php
new file mode 100644
index 000000000..412242a10
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation4.php
@@ -0,0 +1,98 @@
+<?php
+/* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of last occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_strrpos() different data types as $encoding argument to test behaviour
+ * Where possible 'UTF-8' has been entered as a string value
+ */
+
+echo "*** Testing mb_strrpos() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$haystack = b'hello, world';
+$needle = b'world';
+$offset = 0;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strrpos()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strrpos($haystack, $needle, $offset, $input));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation4.php.expectf
new file mode 100644
index 000000000..c565078df
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strrpos_variation4.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_strrpos() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+int(7)
+
+-- Iteration 19 --
+int(7)
+
+-- Iteration 20 --
+int(7)
+
+-- Iteration 21 --
+int(7)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strstr_error1.php b/hphp/test/zend/bad/ext-mbstring/mb_strstr_error1.php
new file mode 100644
index 000000000..2221d4498
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strstr_error1.php
@@ -0,0 +1,26 @@
+<?php
+/* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strstr() : error conditions ***\n";
+
+
+//Test mb_strstr with one more than the expected number of arguments
+echo "\n-- Testing mb_strstr() function with more than expected no. of arguments --\n";
+$haystack = b'string_val';
+$needle = b'string_val';
+$part = true;
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_strstr($haystack, $needle, $part, $encoding, $extra_arg) );
+
+// Testing mb_strstr with one less than the expected number of arguments
+echo "\n-- Testing mb_strstr() function with less than expected no. of arguments --\n";
+$haystack = b'string_val';
+var_dump( mb_strstr($haystack) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strstr_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strstr_error1.php.expectf
new file mode 100644
index 000000000..b4584ad34
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strstr_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strstr() : error conditions ***
+
+-- Testing mb_strstr() function with more than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+
+-- Testing mb_strstr() function with less than expected no. of arguments --
+HipHop Warning: %a
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation1.php
new file mode 100644
index 000000000..e4f9e7178
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation1.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strstr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$needle = b'string_val';
+$part = true;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for haystack
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_strstr($value, $needle, $part, $encoding) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation1.php.expectf
new file mode 100644
index 000000000..4c00e3846
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation1.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mb_strstr() : usage variation ***
+
+--int 0--
+bool(false)
+
+--int 1--
+bool(false)
+
+--int 12345--
+bool(false)
+
+--int -12345--
+bool(false)
+
+--float 10.5--
+bool(false)
+
+--float -10.5--
+bool(false)
+
+--float 12.3456789000e10--
+bool(false)
+
+--float -12.3456789000e10--
+bool(false)
+
+--float .5--
+bool(false)
+
+--empty array--
+Error: 2 - mb_strstr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strstr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strstr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strstr() expects parameter 1 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+bool(false)
+
+--lowercase null--
+bool(false)
+
+--lowercase true--
+bool(false)
+
+--lowercase false--
+bool(false)
+
+--uppercase TRUE--
+bool(false)
+
+--uppercase FALSE--
+bool(false)
+
+--empty string DQ--
+bool(false)
+
+--empty string SQ--
+bool(false)
+
+--instance of classWithToString--
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strstr() expects parameter 1 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+bool(false)
+
+--unset var--
+bool(false)
+
+--resource--
+Error: 2 - mb_strstr() expects parameter 1 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation2.php
new file mode 100644
index 000000000..547d88219
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation2.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strstr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$part = true;
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for needle
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_strstr($haystack, $value, $part, $encoding) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation2.php.expectf
new file mode 100644
index 000000000..c4aae9da0
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation2.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_strstr() : usage variation ***
+
+--int 0--
+bool(false)
+
+--int 1--
+bool(false)
+
+--int 12345--
+bool(false)
+
+--int -12345--
+bool(false)
+
+--float 10.5--
+bool(false)
+
+--float -10.5--
+bool(false)
+
+--float 12.3456789000e10--
+bool(false)
+
+--float -12.3456789000e10--
+bool(false)
+
+--float .5--
+bool(false)
+
+--empty array--
+Error: 2 - mb_strstr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strstr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strstr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strstr() expects parameter 2 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
+bool(false)
+
+--lowercase true--
+bool(false)
+
+--lowercase false--
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
+bool(false)
+
+--uppercase TRUE--
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
+bool(false)
+
+--instance of classWithToString--
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strstr() expects parameter 2 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mb_strstr(): Empty delimiter, %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mb_strstr() expects parameter 2 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation3.php
new file mode 100644
index 000000000..24b628ee3
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation3.php
@@ -0,0 +1,124 @@
+<?php
+/* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strstr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$needle = b'_';
+$encoding = 'utf-8';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return b"Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = b<<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for part
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      $res = mb_strstr($haystack, $needle, $value, $encoding);
+      if ($res === false) {
+         var_dump($res);
+      }
+      else {
+         var_dump(bin2hex($res));
+      }      
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation3.php.expectf
new file mode 100644
index 000000000..c670d8d3e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation3.php.expectf
@@ -0,0 +1,99 @@
+*** Testing mb_strstr() : usage variation ***
+
+--int 0--
+string(8) "5f76616c"
+
+--int 1--
+string(12) "737472696e67"
+
+--int 12345--
+string(12) "737472696e67"
+
+--int -12345--
+string(12) "737472696e67"
+
+--float 10.5--
+string(12) "737472696e67"
+
+--float -10.5--
+string(12) "737472696e67"
+
+--float 12.3456789000e10--
+string(12) "737472696e67"
+
+--float -12.3456789000e10--
+string(12) "737472696e67"
+
+--float .5--
+string(12) "737472696e67"
+
+--empty array--
+Error: 2 - mb_strstr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strstr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strstr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strstr() expects parameter 3 to be boolean, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+string(8) "5f76616c"
+
+--lowercase null--
+string(8) "5f76616c"
+
+--lowercase true--
+string(12) "737472696e67"
+
+--lowercase false--
+string(8) "5f76616c"
+
+--uppercase TRUE--
+string(12) "737472696e67"
+
+--uppercase FALSE--
+string(8) "5f76616c"
+
+--empty string DQ--
+string(8) "5f76616c"
+
+--empty string SQ--
+string(8) "5f76616c"
+
+--string DQ--
+string(12) "737472696e67"
+
+--string SQ--
+string(12) "737472696e67"
+
+--mixed case string--
+string(12) "737472696e67"
+
+--heredoc--
+string(12) "737472696e67"
+
+--instance of classWithToString--
+Error: 2 - mb_strstr() expects parameter 3 to be boolean, object given, %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strstr() expects parameter 3 to be boolean, object given, %s(%d)
+bool(false)
+
+--undefined var--
+string(8) "5f76616c"
+
+--unset var--
+string(8) "5f76616c"
+
+--resource--
+Error: 2 - mb_strstr() expects parameter 3 to be boolean, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation4.php b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation4.php
new file mode 100644
index 000000000..f2fd905f3
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation4.php
@@ -0,0 +1,112 @@
+<?php
+/* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strstr() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'string_val';
+$needle = b'_';
+$part = true;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "invalid";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+invalid
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource variable
+      'resource' => $fp      
+);
+
+// loop through each element of the array for encoding
+
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_strstr($haystack, $needle, $part, $value) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation4.php.expectf
new file mode 100644
index 000000000..3fa8140a4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strstr_variation4.php.expectf
@@ -0,0 +1,106 @@
+*** Testing mb_strstr() : usage variation ***
+
+--int 0--
+Error: 2 - mb_strstr(): Unknown encoding "0", %s(%d)
+bool(false)
+
+--int 1--
+Error: 2 - mb_strstr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--int 12345--
+Error: 2 - mb_strstr(): Unknown encoding "12345", %s(%d)
+bool(false)
+
+--int -12345--
+Error: 2 - mb_strstr(): Unknown encoding "-2345", %s(%d)
+bool(false)
+
+--float 10.5--
+Error: 2 - mb_strstr(): Unknown encoding "10.5", %s(%d)
+bool(false)
+
+--float -10.5--
+Error: 2 - mb_strstr(): Unknown encoding "-10.5", %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mb_strstr(): Unknown encoding "123456789000", %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mb_strstr(): Unknown encoding "-123456789000", %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mb_strstr(): Unknown encoding "0.5", %s(%d)
+bool(false)
+
+--empty array--
+Error: 2 - mb_strstr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--int indexed array--
+Error: 2 - mb_strstr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--associative array--
+Error: 2 - mb_strstr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--nested arrays--
+Error: 2 - mb_strstr() expects parameter 4 to be string, array given, %s(%d)
+bool(false)
+
+--uppercase NULL--
+Error: 2 - mb_strstr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mb_strstr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--lowercase true--
+Error: 2 - mb_strstr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--lowercase false--
+Error: 2 - mb_strstr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--uppercase TRUE--
+Error: 2 - mb_strstr(): Unknown encoding "1", %s(%d)
+bool(false)
+
+--uppercase FALSE--
+Error: 2 - mb_strstr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--empty string DQ--
+Error: 2 - mb_strstr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--empty string SQ--
+Error: 2 - mb_strstr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 2 - mb_strstr(): Unknown encoding "invalid", %s(%d)
+bool(false)
+
+--instance of classWithoutToString--
+Error: 2 - mb_strstr() expects parameter 4 to be string, object given, %s(%d)
+bool(false)
+
+--undefined var--
+Error: 2 - mb_strstr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mb_strstr(): Unknown encoding "", %s(%d)
+bool(false)
+
+--resource--
+Error: 2 - mb_strstr() expects parameter 4 to be string, resource given, %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtolower_error2.php b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_error2.php
new file mode 100644
index 000000000..2eb2ed432
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_error2.php
@@ -0,0 +1,18 @@
+<?php
+/* Prototype  : string mb_strtolower(string $sourcestring [, string $encoding])
+ * Description: Returns a lowercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass an unknown encoding to mb_strtolower() to test behaviour
+ */
+
+echo "*** Testing mb_strtolower() : error conditions***\n";
+
+$sourcestring = 'hello, world';
+$encoding = 'unknown-encoding';
+
+var_dump( mb_strtolower($sourcestring, $encoding) );
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtolower_error2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_error2.php.expectf
new file mode 100644
index 000000000..a81b06633
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_error2.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_strtolower() : error conditions***
+HipHop Warning: %a
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation1.php
new file mode 100644
index 000000000..b8f89548b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation1.php
@@ -0,0 +1,93 @@
+<?php
+/* Prototype  : string mb_strtolower(string $sourcestring [, string $encoding])
+ * Description: Returns a lowercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types to $sourcestring argument to test behaviour of mb_strtolower()
+ */
+
+echo "*** Testing mb_strtolower() : usage variations ***\n";
+
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+Hello World
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $sourcestring argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "String",
+       'String',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strtolower()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strtolower($input) );
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation1.php.expectf
new file mode 100644
index 000000000..8ac430544
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation1.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_strtolower() : usage variations ***
+
+-- Iteration 1 --
+string(1) "0"
+
+-- Iteration 2 --
+string(1) "1"
+
+-- Iteration 3 --
+string(5) "12345"
+
+-- Iteration 4 --
+string(5) "-2345"
+
+-- Iteration 5 --
+string(4) "10.5"
+
+-- Iteration 6 --
+string(5) "-10.5"
+
+-- Iteration 7 --
+string(12) "123456789000"
+
+-- Iteration 8 --
+string(13) "1.23456789e-9"
+
+-- Iteration 9 --
+string(3) "0.5"
+
+-- Iteration 10 --
+string(0) ""
+
+-- Iteration 11 --
+string(0) ""
+
+-- Iteration 12 --
+string(1) "1"
+
+-- Iteration 13 --
+string(0) ""
+
+-- Iteration 14 --
+string(1) "1"
+
+-- Iteration 15 --
+string(0) ""
+
+-- Iteration 16 --
+string(0) ""
+
+-- Iteration 17 --
+string(0) ""
+
+-- Iteration 18 --
+string(6) "string"
+
+-- Iteration 19 --
+string(6) "string"
+
+-- Iteration 20 --
+string(11) "hello world"
+
+-- Iteration 21 --
+string(14) "class a object"
+
+-- Iteration 22 --
+string(0) ""
+
+-- Iteration 23 --
+string(0) ""
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation2.php
new file mode 100644
index 000000000..61bc62d51
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation2.php
@@ -0,0 +1,102 @@
+<?php
+/* Prototype  : string mb_strtolower(string $sourcestring [, string $encoding])
+ * Description: Returns a lowercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types to $encoding argument to test behaviour of mb_strtolower()
+ * Where possible, 'UTF-8' has been entered as a string value
+ */
+
+echo "*** Testing mb_strtolower() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$sourcestring = b'Hello, World';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strtolower()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  $res = mb_strtolower($sourcestring, $input);
+  if ($res === false || $res == NULL) {
+     var_dump($res);
+  }
+  else {
+     var_dump(bin2hex($res));
+  }
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation2.php.expectf
new file mode 100644
index 000000000..81ea2b216
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtolower_variation2.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_strtolower() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 19 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 20 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 21 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_error2.php b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_error2.php
new file mode 100644
index 000000000..22ae9267b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_error2.php
@@ -0,0 +1,19 @@
+<?php
+/* Prototype  : string mb_strtoupper(string $sourcestring [, string $encoding]
+ * Description: Returns a uppercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass an unknown encoding as $encoding argument to check behaviour of mbstrtoupper()
+ */
+
+echo "*** Testing mb_strtoupper() : error conditions ***\n";
+
+$sourcestring = 'hello, world';
+$encoding = 'unknown-encoding';
+
+var_dump( mb_strtoupper($sourcestring, $encoding) );
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_error2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_error2.php.expectf
new file mode 100644
index 000000000..b2f424d71
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_error2.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_strtoupper() : error conditions ***
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation1.php
new file mode 100644
index 000000000..0de8b2892
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation1.php
@@ -0,0 +1,95 @@
+<?php
+/* Prototype  : string mb_strtoupper(string $sourcestring [, string $encoding]
+ * Description: Returns a uppercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * 
+ * Pass different data types as $sourcestring argument to mb_strtoupper to test behaviour
+ */
+
+echo "*** Testing mb_strtoupper() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+Hello, World
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $sourcestring argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "String",
+       'String',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strtoupper()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_strtoupper($input) );
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation1.php.expectf
new file mode 100644
index 000000000..995f27e1d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation1.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_strtoupper() : usage variations ***
+
+-- Iteration 1 --
+string(1) "0"
+
+-- Iteration 2 --
+string(1) "1"
+
+-- Iteration 3 --
+string(5) "12345"
+
+-- Iteration 4 --
+string(5) "-2345"
+
+-- Iteration 5 --
+string(4) "10.5"
+
+-- Iteration 6 --
+string(5) "-10.5"
+
+-- Iteration 7 --
+string(12) "123456789000"
+
+-- Iteration 8 --
+string(13) "1.23456789E-9"
+
+-- Iteration 9 --
+string(3) "0.5"
+
+-- Iteration 10 --
+string(0) ""
+
+-- Iteration 11 --
+string(0) ""
+
+-- Iteration 12 --
+string(1) "1"
+
+-- Iteration 13 --
+string(0) ""
+
+-- Iteration 14 --
+string(1) "1"
+
+-- Iteration 15 --
+string(0) ""
+
+-- Iteration 16 --
+string(0) ""
+
+-- Iteration 17 --
+string(0) ""
+
+-- Iteration 18 --
+string(6) "STRING"
+
+-- Iteration 19 --
+string(6) "STRING"
+
+-- Iteration 20 --
+string(12) "HELLO, WORLD"
+
+-- Iteration 21 --
+string(14) "CLASS A OBJECT"
+
+-- Iteration 22 --
+string(0) ""
+
+-- Iteration 23 --
+string(0) ""
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation2.php
new file mode 100644
index 000000000..5fbefb05a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation2.php
@@ -0,0 +1,102 @@
+<?php
+/* Prototype  : string mb_strtoupper(string $sourcestring [, string $encoding]
+ * Description: Returns a uppercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types as $encoding argument to mb_strtoupper() to test behaviour
+ * Where possible, 'UTF-8' is entered as string value
+ */
+
+echo "*** Testing mb_strtoupper() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$sourcestring = b'Hello, World';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_strtoupper()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  $res = mb_strtoupper($sourcestring, $input);
+  if ($res === false || $res == NULL) {
+     var_dump($res);
+  }
+  else {
+     var_dump(bin2hex($res));
+  }
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation2.php.expectf
new file mode 100644
index 000000000..abec205a2
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_strtoupper_variation2.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_strtoupper() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+string(24) "48454c4c4f2c20574f524c44"
+
+-- Iteration 19 --
+string(24) "48454c4c4f2c20574f524c44"
+
+-- Iteration 20 --
+string(24) "48454c4c4f2c20574f524c44"
+
+-- Iteration 21 --
+string(24) "48454c4c4f2c20574f524c44"
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substitute_character_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_substitute_character_variation1.php
new file mode 100644
index 000000000..d04023cff
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substitute_character_variation1.php
@@ -0,0 +1,113 @@
+<?php
+/* Prototype  : mixed mb_substitute_character([mixed substchar])
+ * Description: Sets the current substitute_character or returns the current substitute_character 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_substitute_character() : usage variation ***\n";
+
+// Define error handler
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	if (error_reporting() != 0) {
+		// report non-silenced errors
+		echo "Error: $err_no - $err_msg, $filename($linenum)\n";
+	}
+}
+set_error_handler('test_error_handler');
+
+// Initialise function arguments not being substituted (if any)
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -2345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float 12.3456789000e10' => 12.3456789000e10,
+      'float -12.3456789000e10' => -12.3456789000e10,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+);
+
+// loop through each element of the array for substchar
+
+mb_internal_encoding('utf-8');
+foreach($inputs as $key =>$value) {
+      echo "\n--$key--\n";
+      var_dump( mb_substitute_character($value) );
+};
+
+fclose($fp);
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substitute_character_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_substitute_character_variation1.php.expectf
new file mode 100644
index 000000000..30e823f9a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substitute_character_variation1.php.expectf
@@ -0,0 +1,108 @@
+*** Testing mb_substitute_character() : usage variation ***
+
+--int 0--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--int 1--
+bool(true)
+
+--int 12345--
+bool(true)
+
+--int -12345--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--float 10.5--
+bool(true)
+
+--float -10.5--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--float 12.3456789000e10--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--float -12.3456789000e10--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--float .5--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--empty array--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--int indexed array--
+bool(true)
+
+--associative array--
+bool(true)
+
+--nested arrays--
+bool(true)
+
+--uppercase NULL--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--lowercase null--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--lowercase true--
+bool(true)
+
+--lowercase false--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--uppercase TRUE--
+bool(true)
+
+--uppercase FALSE--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--empty string DQ--
+bool(true)
+
+--empty string SQ--
+bool(true)
+
+--string DQ--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--string SQ--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--mixed case string--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--heredoc--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--instance of classWithToString--
+Error: 8 - Object of class classWithToString could not be converted to int, %s(%d)
+bool(true)
+
+--instance of classWithoutToString--
+Error: 8 - Object of class classWithoutToString could not be converted to int, %s(%d)
+bool(true)
+
+--undefined var--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+
+--unset var--
+Error: 2 - mb_substitute_character(): Unknown character., %s(%d)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation1.php
new file mode 100644
index 000000000..463ba1544
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation1.php
@@ -0,0 +1,97 @@
+<?php
+/* Prototype  :int mb_substr_count(string $haystack, string $needle [, string $encoding])
+ * Description: Count the number of substring occurrences 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types as $haystack argument to mb_substr_count() to test behaviour
+ */
+
+echo "*** Testing mb_substr_count() : usage variations ***\n";
+
+
+// Initialise function arguments not being substituted
+$needle = 'world';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "hello, world";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello, world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $haystack argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "hello, world",
+       'hello, world',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_substr_count()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_substr_count($input, $needle) );
+  $iterator++;
+};
+
+fclose($fp);
+
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation1.php.expectf
new file mode 100644
index 000000000..aae9176f8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation1.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_substr_count() : usage variations ***
+
+-- Iteration 1 --
+int(0)
+
+-- Iteration 2 --
+int(0)
+
+-- Iteration 3 --
+int(0)
+
+-- Iteration 4 --
+int(0)
+
+-- Iteration 5 --
+int(0)
+
+-- Iteration 6 --
+int(0)
+
+-- Iteration 7 --
+int(0)
+
+-- Iteration 8 --
+int(0)
+
+-- Iteration 9 --
+int(0)
+
+-- Iteration 10 --
+int(0)
+
+-- Iteration 11 --
+int(0)
+
+-- Iteration 12 --
+int(0)
+
+-- Iteration 13 --
+int(0)
+
+-- Iteration 14 --
+int(0)
+
+-- Iteration 15 --
+int(0)
+
+-- Iteration 16 --
+int(0)
+
+-- Iteration 17 --
+int(0)
+
+-- Iteration 18 --
+int(1)
+
+-- Iteration 19 --
+int(1)
+
+-- Iteration 20 --
+int(1)
+
+-- Iteration 21 --
+int(1)
+
+-- Iteration 22 --
+int(0)
+
+-- Iteration 23 --
+int(0)
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation2.php
new file mode 100644
index 000000000..d166e8432
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation2.php
@@ -0,0 +1,95 @@
+<?php
+/* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
+ * Description: Count the number of substring occurrences 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types as $needle to mb_substr_count() to test behaviour
+ */
+
+echo "*** Testing mb_substr_count() : usage variations ***\n";
+
+// Initialise function arguments not being substituted (if any)
+$haystack = 'hello, world';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "world";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $needle argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "world",
+       'world',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_substr_count()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_substr_count($haystack, $input) );
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation2.php.expectf
new file mode 100644
index 000000000..5fb49eed2
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation2.php.expectf
@@ -0,0 +1,83 @@
+*** Testing mb_substr_count() : usage variations ***
+
+-- Iteration 1 --
+int(0)
+
+-- Iteration 2 --
+int(0)
+
+-- Iteration 3 --
+int(0)
+
+-- Iteration 4 --
+int(0)
+
+-- Iteration 5 --
+int(0)
+
+-- Iteration 6 --
+int(0)
+
+-- Iteration 7 --
+int(0)
+
+-- Iteration 8 --
+int(0)
+
+-- Iteration 9 --
+int(0)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+int(0)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+int(0)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+int(1)
+
+-- Iteration 19 --
+int(1)
+
+-- Iteration 20 --
+int(1)
+
+-- Iteration 21 --
+int(1)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation3.php b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation3.php
new file mode 100644
index 000000000..adf17d1a8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation3.php
@@ -0,0 +1,97 @@
+<?php
+/* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
+ * Description: Count the number of substring occurrences 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types as $encoding argument to mb_substr_count() to test behaviour
+ * Where possible, 'UTF-8' is entered as string value
+ */
+
+echo "*** Testing mb_substr_count() : usage variations ***\n";
+
+// Initialise function arguments not being substituted (if any)
+$haystack = b'hello, world';
+$needle = b'world';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_substr_count()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_substr_count($haystack, $needle, $input) );
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation3.php.expectf
new file mode 100644
index 000000000..cef540d73
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substr_count_variation3.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_substr_count() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+int(1)
+
+-- Iteration 19 --
+int(1)
+
+-- Iteration 20 --
+int(1)
+
+-- Iteration 21 --
+int(1)
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substr_variation1.php b/hphp/test/zend/bad/ext-mbstring/mb_substr_variation1.php
new file mode 100644
index 000000000..c7ee0cba6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substr_variation1.php
@@ -0,0 +1,95 @@
+<?php
+/* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
+ * Description: Returns part of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types as $str to mb_substr() to test behaviour
+ */
+
+echo "*** Testing mb_substr() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$start = 0;
+$length = 5;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $str argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_substr()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( mb_substr($input, $start, $length));
+  $iterator++;
+};
+
+fclose($fp);
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substr_variation1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_substr_variation1.php.expectf
new file mode 100644
index 000000000..0fa76f4e2
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substr_variation1.php.expectf
@@ -0,0 +1,75 @@
+*** Testing mb_substr() : usage variations ***
+
+-- Iteration 1 --
+string(1) "0"
+
+-- Iteration 2 --
+string(1) "1"
+
+-- Iteration 3 --
+string(5) "12345"
+
+-- Iteration 4 --
+string(5) "-2345"
+
+-- Iteration 5 --
+string(4) "10.5"
+
+-- Iteration 6 --
+string(5) "-10.5"
+
+-- Iteration 7 --
+string(5) "12345"
+
+-- Iteration 8 --
+string(5) "1.234"
+
+-- Iteration 9 --
+string(3) "0.5"
+
+-- Iteration 10 --
+string(0) ""
+
+-- Iteration 11 --
+string(0) ""
+
+-- Iteration 12 --
+string(1) "1"
+
+-- Iteration 13 --
+string(0) ""
+
+-- Iteration 14 --
+string(1) "1"
+
+-- Iteration 15 --
+string(0) ""
+
+-- Iteration 16 --
+string(0) ""
+
+-- Iteration 17 --
+string(0) ""
+
+-- Iteration 18 --
+string(5) "strin"
+
+-- Iteration 19 --
+string(5) "strin"
+
+-- Iteration 20 --
+string(5) "hello"
+
+-- Iteration 21 --
+string(5) "Class"
+
+-- Iteration 22 --
+string(0) ""
+
+-- Iteration 23 --
+string(0) ""
+
+-- Iteration 24 --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substr_variation2.php b/hphp/test/zend/bad/ext-mbstring/mb_substr_variation2.php
new file mode 100644
index 000000000..ff457acdf
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substr_variation2.php
@@ -0,0 +1,103 @@
+<?php
+/* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
+ * Description: Returns part of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass different data types as $encoding argument to mb_substr() to test behaviour
+ * Where possible, 'UTF-8' is entered as string value
+ */
+
+echo "*** Testing mb_substr() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$str = b'string_val';
+$start = 1;
+$length = 5;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "UTF-8";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $input argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_substr
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  $res = mb_substr($str, $start, $length, $input);
+  if ($res === false) {
+     var_dump($res);
+  }
+  else {
+     var_dump(bin2hex($res));
+  }
+  $iterator++;
+};
+
+fclose($fp);
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_substr_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_substr_variation2.php.expectf
new file mode 100644
index 000000000..b596730df
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/mb_substr_variation2.php.expectf
@@ -0,0 +1,94 @@
+*** Testing mb_substr() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 2 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 3 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 4 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 5 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 6 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 7 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 8 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 9 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 10 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 11 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 12 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 13 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 14 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 15 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 16 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 17 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 18 --
+string(10) "7472696e67"
+
+-- Iteration 19 --
+string(10) "7472696e67"
+
+-- Iteration 20 --
+string(10) "7472696e67"
+
+-- Iteration 21 --
+string(10) "7472696e67"
+
+-- Iteration 22 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 23 --
+HipHop Warning: %a
+bool(false)
+
+-- Iteration 24 --
+HipHop Warning: %a
+string(0) ""
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.php b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.php
new file mode 100644
index 000000000..f9f004fb7
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.php
@@ -0,0 +1,6 @@
+<?php
+$a="aaa\n<>";
+
+var_dump( mb_ereg("^[^><]+$",$a) );
+var_dump( ereg("^[^><]+$",$a) );
+?>
diff --git a/hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.php.expectf b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.php.expectf
new file mode 100644
index 000000000..4760e0af8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.php.expectf
@@ -0,0 +1,4 @@
+bool(false)
+
+Deprecated: Function ereg() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_10830.php on line %d
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.php b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.php
new file mode 100644
index 000000000..b22a91d87
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.php
@@ -0,0 +1,6 @@
+<?php
+set_time_limit(2);
+var_dump(ereg_replace(".*", "b", "a"));
+var_dump(preg_replace("/.*/", "b", "a"));
+var_dump(mb_ereg_replace(".*", "b", "a"));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.php.expectf b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.php.expectf
new file mode 100644
index 000000000..71f6d2e06
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.php.expectf
@@ -0,0 +1,4 @@
+Deprecated: Function ereg_replace() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-1.php on line %d
+string(2) "bb"
+string(2) "bb"
+string(2) "bb"
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php
new file mode 100644
index 000000000..c71c7c5cb
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php
@@ -0,0 +1,6 @@
+<?php
+var_dump(mb_ereg_replace("C?$", "Z", "ABC"));
+var_dump(ereg_replace("C?$", "Z", "ABC"));
+var_dump(mb_ereg_replace("C*$", "Z", "ABC"));
+var_dump(ereg_replace("C*$", "Z", "ABC"));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php.expectf b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php.expectf
new file mode 100644
index 000000000..94fb87f29
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php.expectf
@@ -0,0 +1,8 @@
+string(4) "ABZZ"
+
+Deprecated: Function ereg_replace() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php on line %d
+string(4) "ABZZ"
+string(4) "ABZZ"
+
+Deprecated: Function ereg_replace() is deprecated in hphp/test/zend/bad/ext-mbstring/php_gr_jp_dev_884-2.php on line %d
+string(4) "ABZZ"
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/pictogram1.php b/hphp/test/zend/bad/ext-mbstring/pictogram1.php
new file mode 100644
index 000000000..8c3927648
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/pictogram1.php
@@ -0,0 +1,96 @@
+<?php
+mb_substitute_character(0x3f);
+
+echo "SJIS-Mobile to Unicode\n";
+var_dump(bin2hex(mb_convert_encoding("\xf8\x9f", "UCS-4BE", "SJIS-Mobile#DOCOMO")));
+var_dump(bin2hex(mb_convert_encoding("\xf6\x60", "UCS-4BE", "SJIS-Mobile#KDDI")));
+var_dump(bin2hex(mb_convert_encoding("\xf9\x8b", "UCS-4BE", "SJIS-Mobile#SOFTBANK")));
+
+var_dump(bin2hex(mb_convert_encoding("\xf9\xe6", "UCS-4BE", "SJIS-Mobile#DOCOMO")));
+var_dump(bin2hex(mb_convert_encoding("\xf6\xec", "UCS-4BE", "SJIS-Mobile#KDDI")));
+var_dump(bin2hex(mb_convert_encoding("\xf7\x50", "UCS-4BE", "SJIS-Mobile#SOFTBANK")));
+
+var_dump(bin2hex(mb_convert_encoding("\xf9\x85", "UCS-4BE", "SJIS-Mobile#DOCOMO")));
+var_dump(bin2hex(mb_convert_encoding("\xf4\x89", "UCS-4BE", "SJIS-Mobile#KDDI")));
+var_dump(bin2hex(mb_convert_encoding("\xf7\xb0", "UCS-4BE", "SJIS-Mobile#SOFTBANK")));
+
+var_dump(bin2hex(mb_convert_encoding("\xf3\xd2", "UCS-4BE", "SJIS-Mobile#KDDI")));
+var_dump(bin2hex(mb_convert_encoding("\xfb\xb3", "UCS-4BE", "SJIS-Mobile#SOFTBANK")));
+
+echo "Unicode to SJIS-Mobile\n";
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x26\x00", "SJIS-Mobile#DOCOMO", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x26\x00", "SJIS-Mobile#KDDI", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x26\x00", "SJIS-Mobile#SOFTBANK", "UCS-4BE")));
+
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf3\x40", "SJIS-Mobile#DOCOMO", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf3\x40", "SJIS-Mobile#KDDI", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf3\x40", "SJIS-Mobile#SOFTBANK", "UCS-4BE")));
+
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x00\x23\x00\x00\x20\xe3", "SJIS-Mobile#DOCOMO", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x00\x23\x00\x00\x20\xe3", "SJIS-Mobile#KDDI", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x00\x23\x00\x00\x20\xe3", "SJIS-Mobile#SOFTBANK", "UCS-4BE")));
+
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf1\xe8\x00\x01\xf1\xf3", "SJIS-Mobile#DOCOMO", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf1\xe8\x00\x01\xf1\xf3", "SJIS-Mobile#KDDI", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf1\xe8\x00\x01\xf1\xf3", "SJIS-Mobile#SOFTBANK", "UCS-4BE")));
+
+echo "UTF-8-Mobile to Unicode\n";
+var_dump(bin2hex(mb_convert_encoding("\xee\x98\xbe", "UCS-4BE", "UTF-8-Mobile#DOCOMO")));
+var_dump(bin2hex(mb_convert_encoding("\xee\xbd\xa0", "UCS-4BE", "UTF-8-Mobile#KDDI")));
+var_dump(bin2hex(mb_convert_encoding("\xee\x81\x8a", "UCS-4BE", "UTF-8-Mobile#SOFTBANK")));
+
+var_dump(bin2hex(mb_convert_encoding("\xee\x9d\x81", "UCS-4BE", "UTF-8-Mobile#DOCOMO")));
+var_dump(bin2hex(mb_convert_encoding("\xee\xbf\xac", "UCS-4BE", "UTF-8-Mobile#KDDI")));
+var_dump(bin2hex(mb_convert_encoding("\xee\x84\x90", "UCS-4BE", "UTF-8-Mobile#SOFTBANK")));
+
+var_dump(bin2hex(mb_convert_encoding("\xee\x9b\xa0", "UCS-4BE", "UTF-8-Mobile#DOCOMO")));
+var_dump(bin2hex(mb_convert_encoding("\xee\xb6\x89", "UCS-4BE", "UTF-8-Mobile#KDDI")));
+var_dump(bin2hex(mb_convert_encoding("\xee\x88\x90", "UCS-4BE", "UTF-8-Mobile#SOFTBANK")));
+
+var_dump(bin2hex(mb_convert_encoding("\xee\xb3\x92", "UCS-4BE", "UTF-8-Mobile#KDDI")));
+var_dump(bin2hex(mb_convert_encoding("\xee\x94\x93", "UCS-4BE", "UTF-8-Mobile#SOFTBANK")));
+
+echo "Unicode to UTF8-Mobile\n";
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x26\x00", "UTF-8-Mobile#DOCOMO", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x26\x00", "UTF-8-Mobile#KDDI", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x26\x00", "UTF-8-Mobile#SOFTBANK", "UCS-4BE")));
+
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf3\x40", "UTF-8-Mobile#DOCOMO", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf3\x40", "UTF-8-Mobile#KDDI", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf3\x40", "UTF-8-Mobile#SOFTBANK", "UCS-4BE")));
+
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x00\x23\x00\x00\x20\xe3", "UTF-8-Mobile#DOCOMO", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x00\x23\x00\x00\x20\xe3", "UTF-8-Mobile#KDDI", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x00\x23\x00\x00\x20\xe3", "UTF-8-Mobile#SOFTBANK", "UCS-4BE")));
+
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf1\xe8\x00\x01\xf1\xf3", "UTF-8-Mobile#DOCOMO", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf1\xe8\x00\x01\xf1\xf3", "UTF-8-Mobile#KDDI", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x01\xf1\xe8\x00\x01\xf1\xf3", "UTF-8-Mobile#SOFTBANK", "UCS-4BE")));
+
+echo "Unicode to ISO-2022-JP-MOBILE#KDDI\n";
+var_dump(bin2hex(mb_convert_encoding("\x00\x00\x26\x00", "ISO-2022-JP-MOBILE#KDDI", "UCS-4BE")));
+
+echo "ISO-2022-JP-MOBILE#KDDI to Unicode\n";
+var_dump(bin2hex(mb_convert_encoding("\x1b\x24\x42\x75\x41\x1b\x28\x42", "UCS-4BE", "ISO-2022-JP-MOBILE#KDDI")));
+
+echo "SJIS-Mobile to Unicode (Google) \n";
+var_dump(bin2hex(mb_convert_encoding("\xf9\x86", "UCS-4BE", "SJIS-Mobile#DOCOMO")));
+var_dump(bin2hex(mb_convert_encoding("\xf7\x48", "UCS-4BE", "SJIS-Mobile#KDDI")));
+var_dump(bin2hex(mb_convert_encoding("\xfb\xd8", "UCS-4BE", "SJIS-Mobile#SOFTBANK")));
+
+echo "Unicode (Google) to SJIS-Mobile\n";
+var_dump(bin2hex(mb_convert_encoding("\x00\x0f\xe8\x2d", "SJIS-Mobile#DOCOMO", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x0f\xe8\x2d", "SJIS-Mobile#KDDI", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x0f\xee\x70", "SJIS-Mobile#SOFTBANK", "UCS-4BE")));
+
+echo "UTF-8-Mobile to Unicode (Google) \n";
+var_dump(bin2hex(mb_convert_encoding("\xee\x9b\xa1", "UCS-4BE", "UTF-8-Mobile#DOCOMO")));
+var_dump(bin2hex(mb_convert_encoding("\xef\x81\x88", "UCS-4BE", "UTF-8-Mobile#KDDI")));
+var_dump(bin2hex(mb_convert_encoding("\xee\x94\xb8", "UCS-4BE", "UTF-8-Mobile#SOFTBANK")));//
+
+echo "Unicode (Google) to UTF-8-Mobile\n";
+var_dump(bin2hex(mb_convert_encoding("\x00\x0f\xe8\x2d", "UTF-8-Mobile#DOCOMO", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x0f\xe8\x2d", "UTF-8-Mobile#KDDI", "UCS-4BE")));
+var_dump(bin2hex(mb_convert_encoding("\x00\x0f\xee\x70", "UTF-8-Mobile#SOFTBANK", "UCS-4BE")));//
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/pictogram1.php.expectf b/hphp/test/zend/bad/ext-mbstring/pictogram1.php.expectf
new file mode 100644
index 000000000..4ad3550d4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/pictogram1.php.expectf
@@ -0,0 +1,70 @@
+SJIS-Mobile to Unicode
+string(8) "00002600"
+string(8) "00002600"
+string(8) "00002600"
+string(8) "0001f340"
+string(8) "0001f340"
+string(8) "0001f340"
+string(16) "00000023000020e3"
+string(16) "00000023000020e3"
+string(16) "00000023000020e3"
+string(16) "0001f1e80001f1f3"
+string(16) "0001f1e80001f1f3"
+Unicode to SJIS-Mobile
+string(4) "f89f"
+string(4) "f660"
+string(4) "f98b"
+string(4) "f9e6"
+string(4) "f6ec"
+string(4) "f750"
+string(4) "f985"
+string(4) "f489"
+string(4) "f7b0"
+string(4) "3f3f"
+string(4) "f3d2"
+string(4) "fbb3"
+UTF-8-Mobile to Unicode
+string(8) "00002600"
+string(8) "00002600"
+string(8) "00002600"
+string(8) "0001f340"
+string(8) "0001f340"
+string(8) "0001f340"
+string(16) "00000023000020e3"
+string(16) "00000023000020e3"
+string(16) "00000023000020e3"
+string(16) "0001f1e80001f1f3"
+string(16) "0001f1e80001f1f3"
+Unicode to UTF8-Mobile
+string(6) "ee98be"
+string(6) "eebda0"
+string(6) "ee818a"
+string(6) "ee9d81"
+string(6) "eebfac"
+string(6) "ee8490"
+string(6) "ee9ba0"
+string(6) "eeb689"
+string(6) "ee8890"
+string(16) "f09f87a8f09f87b3"
+string(6) "eeb392"
+string(6) "ee9493"
+Unicode to ISO-2022-JP-MOBILE#KDDI
+string(16) "1b244275411b2842"
+ISO-2022-JP-MOBILE#KDDI to Unicode
+string(8) "00002600"
+SJIS-Mobile to Unicode (Google) 
+string(8) "000fe82d"
+string(8) "000fe82d"
+string(8) "000fee70"
+Unicode (Google) to SJIS-Mobile
+string(4) "f986"
+string(4) "f748"
+string(4) "fbd8"
+UTF-8-Mobile to Unicode (Google) 
+string(8) "000fe82d"
+string(8) "000fe82d"
+string(8) "000fee70"
+Unicode (Google) to UTF-8-Mobile
+string(6) "ee9ba1"
+string(6) "ef8188"
+string(6) "ee94b8"
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/zend_multibyte-12.php b/hphp/test/zend/bad/ext-mbstring/zend_multibyte-12.php
new file mode 100644
index 000000000..93a8f286c
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/zend_multibyte-12.php
@@ -0,0 +1,5 @@
+<?php
+declare(encoding="ISO-8859-15");
+echo 1;
+declare(encoding="ISO-8859-1");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-mbstring/zend_multibyte-12.php.expectf b/hphp/test/zend/bad/ext-mbstring/zend_multibyte-12.php.expectf
new file mode 100644
index 000000000..3dad4aedf
--- /dev/null
+++ b/hphp/test/zend/bad/ext-mbstring/zend_multibyte-12.php.expectf
@@ -0,0 +1 @@
+HipHop Fatal error: %a
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug25140.php b/hphp/test/zend/good/ext-mbstring/bug25140.php
new file mode 100644
index 000000000..c20450615
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug25140.php
@@ -0,0 +1,3 @@
+<?php
+var_dump( mb_convert_encoding( '', 'SJIS', 'EUC-JP' ) );
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug25140.php.expectf b/hphp/test/zend/good/ext-mbstring/bug25140.php.expectf
new file mode 100644
index 000000000..bda791eae
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug25140.php.expectf
@@ -0,0 +1 @@
+string(0) ""
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug30549.php b/hphp/test/zend/good/ext-mbstring/bug30549.php
new file mode 100644
index 000000000..0be198f40
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug30549.php
@@ -0,0 +1,15 @@
+<?php
+test('ISO-8859-7',  array(0xa4 => 0x20ac, 0xa5 => 0x20af, 0xaa => 0x037a));
+test('ISO-8859-8',  array(0xaf => 0x00af, 0xfd => 0x200e, 0xfe => 0x200f));
+test('ISO-8859-10', array(0xa4 => 0x012a                                ));
+
+function test($enc, $map) {
+	print "$enc\n";
+
+	foreach($map as $fromc => $toc) {
+		$ustr = mb_convert_encoding(pack('C', $fromc), 'UCS-4BE', $enc);
+		foreach (unpack('Nc', $ustr) as $unic);
+		printf("0x%04x, 0x%04x\n", $toc, $unic);
+	}
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug30549.php.expectf b/hphp/test/zend/good/ext-mbstring/bug30549.php.expectf
new file mode 100644
index 000000000..219adc26f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug30549.php.expectf
@@ -0,0 +1,10 @@
+ISO-8859-7
+0x20ac, 0x20ac
+0x20af, 0x20af
+0x037a, 0x037a
+ISO-8859-8
+0x00af, 0x00af
+0x200e, 0x200e
+0x200f, 0x200f
+ISO-8859-10
+0x012a, 0x012a
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug31911.php b/hphp/test/zend/good/ext-mbstring/bug31911.php
new file mode 100644
index 000000000..c92cb3c15
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug31911.php
@@ -0,0 +1,5 @@
+<?php
+echo mb_decode_mimeheader("Works: =?iso-8859-1?q?=3F=3F=3F?=");
+echo "\n";
+echo mb_decode_mimeheader("Fails: =?iso-8859-1?q?=3f=3f=3f?=")
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug31911.php.expectf b/hphp/test/zend/good/ext-mbstring/bug31911.php.expectf
new file mode 100644
index 000000000..1deff62d1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug31911.php.expectf
@@ -0,0 +1,2 @@
+Works: ???
+Fails: ???
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug43993.php b/hphp/test/zend/good/ext-mbstring/bug43993.php
new file mode 100644
index 000000000..3f7f91fc9
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug43993.php
@@ -0,0 +1,11 @@
+<?php
+var_dump(mb_substr_count("abcabcabca", "abcabc"));
+var_dump(mb_substr_count("abcabcabca", "abc"));
+var_dump(mb_substr_count("abcabcabca", "cab"));
+var_dump(mb_substr_count("abcabcabca", "bca"));
+var_dump(mb_substr_count("ababababab", "ba"));
+var_dump(mb_substr_count("ababababab", "ab"));
+var_dump(mb_substr_count("ababababab", "bc"));
+var_dump(mb_substr_count("aaaaaaaaaa", "a"));
+var_dump(mb_substr_count("aaaaaaaaaa", "b"));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug43993.php.expectf b/hphp/test/zend/good/ext-mbstring/bug43993.php.expectf
new file mode 100644
index 000000000..78c475512
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug43993.php.expectf
@@ -0,0 +1,9 @@
+int(1)
+int(3)
+int(2)
+int(3)
+int(4)
+int(5)
+int(0)
+int(10)
+int(0)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug45722.php b/hphp/test/zend/good/ext-mbstring/bug45722.php
new file mode 100644
index 000000000..4e51b580c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug45722.php
@@ -0,0 +1,3 @@
+<?php
+var_dump(mb_check_encoding("&\xc2\xb7 TEST TEST TEST TEST TEST TEST", "HTML-ENTITIES"));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug45722.php.expectf b/hphp/test/zend/good/ext-mbstring/bug45722.php.expectf
new file mode 100644
index 000000000..eb28e0c67
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug45722.php.expectf
@@ -0,0 +1 @@
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug46806.php b/hphp/test/zend/good/ext-mbstring/bug46806.php
new file mode 100644
index 000000000..3946314f3
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug46806.php
@@ -0,0 +1,4 @@
+<?php
+echo mb_strimwidth('helloworld', 0, 5, '...', 'UTF-8') . "\n";
+echo mb_strimwidth('hello', 0, 5, '...', 'UTF-8');
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug46806.php.expectf b/hphp/test/zend/good/ext-mbstring/bug46806.php.expectf
new file mode 100644
index 000000000..254c35257
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug46806.php.expectf
@@ -0,0 +1,2 @@
+he...
+hello
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug46843.php b/hphp/test/zend/good/ext-mbstring/bug46843.php
new file mode 100644
index 000000000..3f2ddb898
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug46843.php
@@ -0,0 +1,4 @@
+<?php
+var_dump(bin2hex(mb_convert_encoding("\x80", 'UCS-2BE', 'CP936')));
+var_dump(bin2hex(mb_convert_encoding("\x20\xac", 'CP936', 'UCS-2BE')));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug46843.php.expectf b/hphp/test/zend/good/ext-mbstring/bug46843.php.expectf
new file mode 100644
index 000000000..f82354e9e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug46843.php.expectf
@@ -0,0 +1,2 @@
+string(4) "20ac"
+string(2) "80"
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug47399.php b/hphp/test/zend/good/ext-mbstring/bug47399.php
new file mode 100644
index 000000000..9c26fde88
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug47399.php
@@ -0,0 +1,7 @@
+<?php
+foreach (array("Shift_JIS", "CP932") as $enc) {
+    for ($a = 0; $a < 256; $a++) {
+        var_dump(mb_check_encoding("\x81".pack("c", $a), $enc));
+    }
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug47399.php.expectf b/hphp/test/zend/good/ext-mbstring/bug47399.php.expectf
new file mode 100644
index 000000000..d8bce5fc3
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug47399.php.expectf
@@ -0,0 +1,512 @@
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(false)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(false)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(false)
+bool(false)
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug48645.php b/hphp/test/zend/good/ext-mbstring/bug48645.php
new file mode 100644
index 000000000..dcf1b9c83
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug48645.php
@@ -0,0 +1,79 @@
+<?php
+var_dump(bin2hex(mb_convert_encoding("&#x0;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x1;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x2;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x3;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x4;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x5;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x6;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x7;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x8;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x9;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xA;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xB;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xC;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xD;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xE;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xF;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xa;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xb;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xc;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xd;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xe;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xf;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x/;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x:;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x@;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x`;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xG;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#xg;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X0;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X1;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X2;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X3;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X4;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X5;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X6;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X7;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X8;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X9;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#XA;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#XB;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#XC;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#XD;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#XE;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#XF;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#Xa;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#Xb;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#Xc;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#Xd;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#Xe;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#Xf;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X/;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X:;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X@;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X`;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#XG;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#Xg;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#0;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#1;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#2;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#3;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#4;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#5;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#6;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#7;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#8;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#9;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#/;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#:;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x10ffff;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#x110000;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X10ffff;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#X110000;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#1114111;", "UTF-8", "HTML-ENTITIES")));
+var_dump(bin2hex(mb_convert_encoding("&#1114112;", "UTF-8", "HTML-ENTITIES")));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug48645.php.expectf b/hphp/test/zend/good/ext-mbstring/bug48645.php.expectf
new file mode 100644
index 000000000..c6a3781a0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug48645.php.expectf
@@ -0,0 +1,77 @@
+string(2) "00"
+string(2) "01"
+string(2) "02"
+string(2) "03"
+string(2) "04"
+string(2) "05"
+string(2) "06"
+string(2) "07"
+string(2) "08"
+string(2) "09"
+string(2) "0a"
+string(2) "0b"
+string(2) "0c"
+string(2) "0d"
+string(2) "0e"
+string(2) "0f"
+string(2) "0a"
+string(2) "0b"
+string(2) "0c"
+string(2) "0d"
+string(2) "0e"
+string(2) "0f"
+string(10) "2623782f3b"
+string(10) "2623783a3b"
+string(10) "262378403b"
+string(10) "262378603b"
+string(10) "262378473b"
+string(10) "262378673b"
+string(8) "2623783b"
+string(2) "00"
+string(2) "01"
+string(2) "02"
+string(2) "03"
+string(2) "04"
+string(2) "05"
+string(2) "06"
+string(2) "07"
+string(2) "08"
+string(2) "09"
+string(2) "0a"
+string(2) "0b"
+string(2) "0c"
+string(2) "0d"
+string(2) "0e"
+string(2) "0f"
+string(2) "0a"
+string(2) "0b"
+string(2) "0c"
+string(2) "0d"
+string(2) "0e"
+string(2) "0f"
+string(10) "2623582f3b"
+string(10) "2623583a3b"
+string(10) "262358403b"
+string(10) "262358603b"
+string(10) "262358473b"
+string(10) "262358673b"
+string(8) "2623583b"
+string(2) "00"
+string(2) "01"
+string(2) "02"
+string(2) "03"
+string(2) "04"
+string(2) "05"
+string(2) "06"
+string(2) "07"
+string(2) "08"
+string(2) "09"
+string(8) "26232f3b"
+string(8) "26233a3b"
+string(6) "26233b"
+string(8) "f48fbfbf"
+string(20) "2623783131303030303b"
+string(8) "f48fbfbf"
+string(20) "2623583131303030303b"
+string(8) "f48fbfbf"
+string(20) "2623313131343131323b"
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug49354.php b/hphp/test/zend/good/ext-mbstring/bug49354.php
new file mode 100644
index 000000000..0f23e5b95
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug49354.php
@@ -0,0 +1,9 @@
+<?php
+$crap = 'A奪B辰C旦D端';
+var_dump(mb_strcut($crap, 0, 100, 'UTF-8'));
+var_dump(mb_strcut($crap, 1, 100, 'UTF-8'));
+var_dump(mb_strcut($crap, 2, 100, 'UTF-8'));
+var_dump(mb_strcut($crap, 3, 100, 'UTF-8'));
+var_dump(mb_strcut($crap, 12, 100, 'UTF-8'));
+var_dump(mb_strcut($crap, 13, 100, 'UTF-8'));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug49354.php.expectf b/hphp/test/zend/good/ext-mbstring/bug49354.php.expectf
new file mode 100644
index 000000000..09ae55bb0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug49354.php.expectf
@@ -0,0 +1,6 @@
+string(12) "A奪B辰C旦D端"
+string(11) "奪B辰C旦D端"
+string(11) "奪B辰C旦D端"
+string(9) "B辰C旦D端"
+string(0) ""
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug49528.php b/hphp/test/zend/good/ext-mbstring/bug49528.php
new file mode 100644
index 000000000..3dce201f9
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug49528.php
@@ -0,0 +1,8 @@
+<?php
+var_dump(bin2hex(mb_convert_encoding("\xff\xfe\x01\x02\x03\x04", "UCS-2BE", "UTF-16")));
+var_dump(bin2hex(mb_convert_encoding("\xfe\xff\x01\x02\x03\x04", "UCS-2BE", "UTF-16")));
+var_dump(bin2hex(mb_convert_encoding("\xff\xfe\xff\xfe\x01\x02\x03\x04", "UCS-2BE", "UTF-16")));
+var_dump(bin2hex(mb_convert_encoding("\xff\xfe\xfe\xff\x01\x02\x03\x04", "UCS-2BE", "UTF-16")));
+var_dump(bin2hex(mb_convert_encoding("\xfe\xff\xff\xfe\x01\x02\x03\x04", "UCS-2BE", "UTF-16")));
+var_dump(bin2hex(mb_convert_encoding("\xfe\xff\xfe\xff\x01\x02\x03\x04", "UCS-2BE", "UTF-16")));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug49528.php.expectf b/hphp/test/zend/good/ext-mbstring/bug49528.php.expectf
new file mode 100644
index 000000000..4b355d142
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug49528.php.expectf
@@ -0,0 +1,6 @@
+string(8) "02010403"
+string(8) "01020304"
+string(12) "feff02010403"
+string(12) "fffe02010403"
+string(12) "fffe01020304"
+string(12) "feff01020304"
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug54494.php b/hphp/test/zend/good/ext-mbstring/bug54494.php
new file mode 100644
index 000000000..cc5b153f6
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug54494.php
@@ -0,0 +1,39 @@
+<?php
+
+//declare(encoding = 'UTF-8');
+mb_internal_encoding('UTF-8');
+
+header('Content-Type: text/plain; charset=UTF-32LE');
+
+$stringOr = "h辰ll旦 w旦rld\n";
+
+$mode = "UTF-32LE";
+
+echo "$mode:\n";
+
+$string = mb_convert_encoding($stringOr, $mode);
+$length = mb_strlen($string, $mode);
+echo "Length: ", $length, "\n";
+
+
+for ($i=0; $i < $length; $i++) {
+  $t = unpack("H*",mb_substr($string, $i, 1, $mode));
+  echo $t[1];
+}
+echo "\n";
+
+
+$mode = "UCS-2LE";
+
+echo "$mode:\n";
+
+$string = mb_convert_encoding($stringOr, $mode);
+$length = mb_strlen($string, $mode);
+echo "Length: ", $length, "\n";
+
+
+for ($i=0; $i < $length; $i++) {
+  $t = unpack("H*",mb_substr($string, $i, 1, $mode));
+  echo $t[1];
+}
+echo "\n";
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug54494.php.expectf b/hphp/test/zend/good/ext-mbstring/bug54494.php.expectf
new file mode 100644
index 000000000..386106198
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug54494.php.expectf
@@ -0,0 +1,6 @@
+UTF-32LE:
+Length: 12
+68000000e40000006c0000006c000000f60000002000000077000000f6000000720000006c000000640000000a000000
+UCS-2LE:
+Length: 12
+6800e4006c006c00f60020007700f60072006c0064000a00
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug60306.php b/hphp/test/zend/good/ext-mbstring/bug60306.php
new file mode 100644
index 000000000..b5d2d53e2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug60306.php
@@ -0,0 +1,4 @@
+<?php
+$s = "羇�篁����";
+var_dump($s === mb_convert_encoding(mb_convert_encoding($s, "cp936", "utf8"), "utf8", "cp936"));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/bug60306.php.expectf b/hphp/test/zend/good/ext-mbstring/bug60306.php.expectf
new file mode 100644
index 000000000..254d25151
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/bug60306.php.expectf
@@ -0,0 +1 @@
+bool(true)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/common.inc b/hphp/test/zend/good/ext-mbstring/common.inc
new file mode 100644
index 000000000..1df634107
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/common.inc
@@ -0,0 +1,55 @@
+<?php
+/*
+ * Common definition and Settings
+ */
+
+// Custom Error Hanlder for testing
+function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
+	global $debug;
+	
+	$err_type = array (
+				1	=> "Error",			// E_ERROR
+				2	=> "Warning",			// E_WARINING
+				4	=> "Parsing Error",	// E_PARSE
+				8	=> "Notice",			// E_NOTICE
+				16	=> "Core Error",		// E_CORE_ERROR
+				32	=> "Core Warning",		// E_CORE_WARNING
+				64	=> "Compile Error",	// E_COMPILE_ERROR
+				128 => "Compile Warning",	// E_COMPILE_WARNING
+				256 => "User Error",		// E_USER_ERROR
+				512 => "User Warning",		// E_USER_WARMING
+				1024=> "User Notice",		// E_USER_NOTICE
+				2048=> "Strict Notice",      // E_STRICT
+				4096=> "Catchable fatal error",      // E_RECOVERABLE_ERROR
+				);
+	
+	if (!empty($debug)) {
+		printf("%s: %s (%d)\n", $err_type[$err_no], $err_msg, $linenum);
+	}
+	else {
+		printf("ERR: %s\n",$err_type[$err_no]);
+	}
+}
+
+set_error_handler('test_error_handler');
+
+
+// Var def for testing
+$t_ary = array(
+		's1' => '日本語EUC-JPの文字列',
+		's2' => 'English Text'
+		);
+
+class tc
+{
+	public $s1 = '日本語EUC-JPの文字列';
+	public $s2 = 'English Text';
+
+	function tc() 
+	{
+	}
+}
+
+$t_obj = new tc;
+
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/empty_pattern.php b/hphp/test/zend/good/ext-mbstring/empty_pattern.php
new file mode 100644
index 000000000..9cb032d07
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/empty_pattern.php
@@ -0,0 +1,7 @@
+<?php
+
+mb_ereg_search_init("","","");
+mb_split("","");
+mb_ereg_search_regs();
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/empty_pattern.php.expectf b/hphp/test/zend/good/ext-mbstring/empty_pattern.php.expectf
new file mode 100644
index 000000000..55529a618
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/empty_pattern.php.expectf
@@ -0,0 +1,2 @@
+HipHop Warning: %a
+HipHop Warning: %a
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_basic.php b/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_basic.php
new file mode 100644
index 000000000..d0f799202
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_basic.php
@@ -0,0 +1,52 @@
+<?php
+/* Prototype  : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding])
+ * Description: Returns converted string in desired encoding 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test basic functionality of mb_convert_encoding()
+ */
+
+echo "*** Testing mb_convert_encoding() : basic functionality ***\n";
+
+//All strings are the same when displayed in their respective encodings
+$sjis_string = base64_decode('k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==');
+$jis_string = base64_decode('GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==');
+$euc_jp_string = base64_decode('xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==');
+$utf8_string = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+echo "\n-- Convert to JIS --\n";
+echo "JIS encoded string in base64:\n";
+var_dump(base64_encode($jis_string));
+echo "Converted Strings:\n";
+var_dump(base64_encode(mb_convert_encoding($sjis_string, 'JIS', 'SJIS')));
+var_dump(base64_encode(mb_convert_encoding($euc_jp_string, 'JIS', 'EUC-JP')));
+var_dump(base64_encode(mb_convert_encoding($utf8_string, 'JIS', 'UTF-8')));
+
+echo "\n-- Convert to EUC-JP --\n";
+echo "EUC-JP encoded string in base64:\n";
+var_dump(base64_encode($euc_jp_string));
+echo "Converted Strings:\n";
+var_dump(base64_encode(mb_convert_encoding($sjis_string, 'EUC-JP', 'SJIS')));
+var_dump(base64_encode(mb_convert_encoding($jis_string, 'EUC-JP', 'JIS')));
+var_dump(base64_encode(mb_convert_encoding($utf8_string, 'EUC-JP', 'UTF-8')));
+
+echo "\n-- Convert to SJIS --\n";
+echo "SJIS encoded string in base64:\n";
+var_dump(base64_encode($sjis_string));
+echo "Converted Strings:\n";
+var_dump(base64_encode(mb_convert_encoding($jis_string, 'SJIS', 'JIS')));
+var_dump(base64_encode(mb_convert_encoding($euc_jp_string, 'SJIS', 'EUC-JP')));
+var_dump(base64_encode(mb_convert_encoding($utf8_string, 'SJIS', 'UTF-8')));
+
+echo "\n-- Convert to UTF-8 --\n";
+echo "UTF-8 encoded string in base64:\n";
+var_dump(base64_encode($utf8_string));
+echo "Converted Strings:\n";
+var_dump(base64_encode(mb_convert_encoding($sjis_string, 'UTF-8', 'SJIS')));
+var_dump(base64_encode(mb_convert_encoding($jis_string, 'UTF-8', 'JIS')));
+var_dump(base64_encode(mb_convert_encoding($euc_jp_string, 'UTF-8', 'EUC-JP')));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_basic.php.expectf
new file mode 100644
index 000000000..9bb98b0ea
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_basic.php.expectf
@@ -0,0 +1,34 @@
+*** Testing mb_convert_encoding() : basic functionality ***
+
+-- Convert to JIS --
+JIS encoded string in base64:
+string(68) "GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg=="
+Converted Strings:
+string(68) "GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg=="
+string(68) "GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg=="
+string(68) "GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg=="
+
+-- Convert to EUC-JP --
+EUC-JP encoded string in base64:
+string(52) "xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow=="
+Converted Strings:
+string(52) "xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow=="
+string(52) "xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow=="
+string(52) "xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow=="
+
+-- Convert to SJIS --
+SJIS encoded string in base64:
+string(52) "k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg=="
+Converted Strings:
+string(52) "k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg=="
+string(52) "k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg=="
+string(52) "k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg=="
+
+-- Convert to UTF-8 --
+UTF-8 encoded string in base64:
+string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+Converted Strings:
+string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php b/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php
new file mode 100644
index 000000000..23d4d27e8
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php
@@ -0,0 +1,97 @@
+<?php
+/* Prototype  : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding])
+ * Description: Returns converted string in desired encoding 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+
+/*
+ * Pass different data types to $to_encoding arg to test behaviour of mb_convert_encoding
+ */
+
+echo "*** Testing mb_convert_encoding() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+mb_internal_encoding('utf-8');
+$sourcestring = b'hello, world';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+UTF-8
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $to_encoding argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "UTF-8",
+       'UTF-8',
+       $heredoc,
+       
+       // object data
+/*21*/ new classA(),
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+
+       // resource variable
+/*24*/ $fp
+);
+
+// loop through each element of $inputs to check the behaviour of mb_convert_encoding()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump(bin2hex( mb_convert_encoding($sourcestring, $input, 'ISO-8859-1') ));
+  $iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php.expectf
new file mode 100644
index 000000000..6fa8ea0a7
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php.expectf
@@ -0,0 +1,87 @@
+*** Testing mb_convert_encoding() : usage variations ***
+
+-- Iteration 1 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 2 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 3 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 4 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 5 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 6 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 7 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 8 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 9 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 10 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 11 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 12 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 13 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 14 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 15 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 16 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 17 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 18 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 19 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 20 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 21 --
+HipHop Warning: %a
+string(0) ""
+
+-- Iteration 22 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 23 --
+string(24) "68656c6c6f2c20776f726c64"
+
+-- Iteration 24 --
+HipHop Warning: %a
+string(0) ""
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_convert_kana.php b/hphp/test/zend/good/ext-mbstring/mb_convert_kana.php
new file mode 100644
index 000000000..d069f71e0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_convert_kana.php
@@ -0,0 +1,35 @@
+<?php
+$zenKakuA    =	'��＜�≪�ｃ�ゃ�ャ����с�����������������������';
+$zenKakuB    =	'��違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴�祉�若�純�障��';
+$zenKakuC    =	'������������������������������������������������';
+$zenKakuD    =	'������������������������������������������������';
+$zenKakuE    =	'�����＜�≪�ｃ�ゃ�ャ����с�����������������������';
+$zenKakuF    =	'��違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴�祉�若�純��';
+
+$hanKakuA    =	'鐔�鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔�';
+$hanKakuB    =	'鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎';
+$hanKakuC    =	'鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�';
+$hanKakuD    =	'鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�';
+
+
+echo $zenKakuA . ' => ' . mb_convert_kana($zenKakuA, 'AZKH', 'utf-8');
+echo "\n";
+echo $zenKakuB . ' => ' . mb_convert_kana($zenKakuB, 'azkh', 'utf-8');
+echo "\n";
+echo $zenKakuC . ' => ' . mb_convert_kana($zenKakuC, 'azkh', 'utf-8');
+echo "\n";
+echo $zenKakuD . ' => ' . mb_convert_kana($zenKakuD, 'azkh', 'utf-8');
+echo "\n";
+echo $zenKakuE . ' => ' . mb_convert_kana($zenKakuE, 'azkh', 'utf-8');
+echo "\n";
+echo $zenKakuF . ' => ' . mb_convert_kana($zenKakuF, 'azkh', 'utf-8');
+echo "\n";
+echo "\n";
+echo $hanKakuA . ' => ' . mb_convert_kana($hanKakuA, 'AZKH', 'utf-8');
+echo "\n";
+echo $hanKakuB . ' => ' . mb_convert_kana($hanKakuB, 'AZKH', 'utf-8');
+echo "\n";
+echo $hanKakuC . ' => ' . mb_convert_kana($hanKakuC, 'AZKH', 'utf-8');
+echo "\n";
+echo $hanKakuD . ' => ' . mb_convert_kana($hanKakuD, 'AZKH', 'utf-8');
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_convert_kana.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_convert_kana.php.expectf
new file mode 100644
index 000000000..8efa3b3b4
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_convert_kana.php.expectf
@@ -0,0 +1,11 @@
+��＜�≪�ｃ�ゃ�ャ����с����������������������� => ��＜�≪�ｃ�ゃ�ャ����с�����������������������
+��違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴�祉�若�純�障�� => 鐔醐��鐔刻醜鐓�鐔削什鐓�鐔誌住鐓�鐔種充鐓�鐔緒十鐓�鐔常従鐓�鐔随戎鐓�鐓�
+������������������������������������������������ => 鐓�鐓�鐓�鐓�鐓�鐔�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
+������������������������������������������������ => 鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
+�����＜�≪�ｃ�ゃ�ャ����с����������������������� => 鐓�鐓�鐓�鐔�鐓�鐔�鐓�鐔�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�
+��違�宴�蚊�潟�眼�泣�吟�激�吾�鴻�冴�祉�若�純�� => 鐔駕輯鐔�鐓�鐔鰹����泣�吟�激�吾�鴻�削愁鐔違�純��
+
+鐔�鐔￥就鐔ｏ修鐔ワ拾鐔э秀鐔�鐔�鐔�鐔�鐔�鐔�鐔� => 鐔���������������祉�蚊�＜�ｃ�ャ�с����ｃ�ャ�с��
+鐔逸襲鐔駕蹴鐔器週鐔駈酬鐔醐醜鐔削住鐔種十鐔常戎 => ��若�≪�ゃ�������������������宴�潟�泣�激�鴻�祉��
+鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓� => ��帥��������������������������������������������
+鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓�鐓� => ��������＜�≪�ゃ�������������������������潟�����
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_basic.php b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_basic.php
new file mode 100644
index 000000000..e71ea6c8d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_basic.php
@@ -0,0 +1,22 @@
+<?php
+/* Prototype  : string mb_decode_mimeheader(string string)
+ * Description: Decodes the MIME "encoded-word" in the string 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_decode_mimeheader() : basic functionality ***\n";
+mb_internal_encoding('utf-8');
+
+//the following encoded-words are identical and are UTF-8 Japanese. 
+$a = "=?UTF-8?b?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=";
+$b = mb_decode_mimeheader($a);
+var_dump(bin2hex($b));
+
+$a = "=?UTF-8?Q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?=
+=?UTF-8?Q?=E3=81=A7=E3=81=99=E3=80=82?=";
+$b = mb_decode_mimeheader($a);
+var_dump(bin2hex($b));
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_basic.php.expectf
new file mode 100644
index 000000000..0488a2b1a
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_basic.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_decode_mimeheader() : basic functionality ***
+string(60) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e38082"
+string(60) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e38082"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php
new file mode 100644
index 000000000..1c01c7b73
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php
@@ -0,0 +1,21 @@
+<?php
+/* Prototype  : string mb_decode_mimeheader(string string)
+ * Description: Decodes the MIME "encoded-word" in the string 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_decode_mimeheader() : error conditions ***\n";
+
+// Zero arguments
+echo "\n-- Testing mb_decode_mimeheader() function with Zero arguments --\n";
+var_dump( mb_decode_mimeheader() );
+
+//Test mb_decode_mimeheader with one more than the expected number of arguments
+echo "\n-- Testing mb_decode_mimeheader() function with more than expected no. of arguments --\n";
+$string = 'string_val';
+$extra_arg = 10;
+var_dump( mb_decode_mimeheader($string, $extra_arg) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php.expectf
new file mode 100644
index 000000000..8008e5a93
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_decode_mimeheader() : error conditions ***
+
+-- Testing mb_decode_mimeheader() function with Zero arguments --
+HipHop Warning: %a
+NULL
+
+-- Testing mb_decode_mimeheader() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation2.php b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation2.php
new file mode 100644
index 000000000..3c4097095
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation2.php
@@ -0,0 +1,34 @@
+<?php
+/* Prototype  : string mb_decode_mimeheader(string string)
+ * Description: Decodes the MIME "encoded-word" in the string 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_decode_mimeheader() : variation ***\n";
+mb_internal_encoding('utf-8');
+
+//all the following are identical, we will convert to utf-8
+
+$encoded_words = array(
+"=?Shift_JIS?B?k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==?=",
+"=?Shift_JIS?Q?=93=FA=96=7B=8C=EA=83e=83L=83X=83g=82=C5=82=B7=81B=30=31=32?=
+=?Shift_JIS?Q?=33=34=82T=82U=82V=82W=82X=81B?=",
+
+"=?ISO-2022-JP?B?GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYbKEI=?=
+=?ISO-2022-JP?B?GyRCIzcjOCM5ISMbKEI=?=",
+"=?ISO-2022-JP?Q?=1B=24BF=7CK=5C=38l=25F=25-=25=39=25H=24G=24=39=1B=28B?=
+=?ISO-2022-JP?Q?=1B=24B!=23=1B=28B=30=31=32=33=34=1B=24B=23=35=1B=28B?=
+=?ISO-2022-JP?Q?=1B=24B=23=36=23=37=23=38=23=39!=23=1B=28B?=",
+
+"=?EUC-JP?B?xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==?=",
+"=?EUC-JP?Q?=C6=FC=CB=DC=B8=EC=A5=C6=A5=AD=A5=B9=A5=C8=A4=C7=A4=B9=A1=A3?=
+=?EUC-JP?Q?=30=31=32=33=34=A3=B5=A3=B6=A3=B7=A3=B8=A3=B9=A1=A3?="
+ );
+ 
+ foreach ($encoded_words as $word) {
+    var_dump(bin2hex(mb_decode_mimeheader($word)));
+}
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation2.php.expectf
new file mode 100644
index 000000000..ffbebda0a
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation2.php.expectf
@@ -0,0 +1,8 @@
+*** Testing mb_decode_mimeheader() : variation ***
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation3.php b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation3.php
new file mode 100644
index 000000000..e6cee19df
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation3.php
@@ -0,0 +1,17 @@
+<?php
+/* Prototype  : string mb_decode_mimeheader(string string)
+ * Description: Decodes the MIME "encoded-word" in the string 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_decode_mimeheader() : variation ***\n";
+mb_internal_encoding('iso-8859-7');
+
+//greek in UTF-8 to be converted to iso-8859-7
+$encoded_word = "=?UTF-8?B?zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J?=";
+var_dump(bin2hex(mb_decode_mimeheader($encoded_word)));
+
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation3.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation3.php.expectf
new file mode 100644
index 000000000..3e1db71cf
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_variation3.php.expectf
@@ -0,0 +1,3 @@
+*** Testing mb_decode_mimeheader() : variation ***
+string(48) "e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f3f4f5f6f7f8f9"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_numericentity.php b/hphp/test/zend/good/ext-mbstring/mb_decode_numericentity.php
new file mode 100644
index 000000000..977f54155
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_decode_numericentity.php
@@ -0,0 +1,9 @@
+<?php
+$str1 = '&#161;&#162;&#163;&#164;&#165;&#166;&#167;&#168;&#169;&#170;&#171;&#172;&#173;&#174;&#175;&#176;&#177;&#178;&#179;&#180;&#181;&#182;&#183;&#184;&#185;&#186;&#187;&#188;&#189;&#190;&#191;&#192;&#193;&#194;&#195;&#196;&#197;&#198;&#199;&#200;&#201;&#202;&#203;&#204;&#205;&#206;&#207;&#208;&#209;&#210;&#211;&#212;&#213;&#214;&#215;&#216;&#217;&#218;&#219;&#220;&#221;&#222;&#223;&#224;&#225;&#226;&#227;&#228;&#229;&#230;&#231;&#232;&#233;&#234;&#235;&#236;&#237;&#238;&#239;&#240;&#241;&#242;&#243;&#244;&#245;&#246;&#247;&#248;&#249;&#250;&#251;&#252;&#253;&#254;&#255;';
+$str2 = '&#402;&#913;&#914;&#915;&#916;&#917;&#918;&#919;&#920;&#921;&#922;&#923;&#924;&#925;&#926;&#927;&#928;&#929;&#931;&#932;&#933;&#934;&#935;&#936;&#937;&#945;&#946;&#947;&#948;&#949;&#950;&#951;&#952;&#953;&#954;&#955;&#956;&#957;&#958;&#959;&#960;&#961;&#962;&#963;&#964;&#965;&#966;&#967;&#968;&#969;&#977;&#978;&#982;&#8226;&#8230;&#8242;&#8243;&#8254;&#8260;&#8472;&#8465;&#8476;&#8482;&#8501;&#8592;&#8593;&#8594;&#8595;&#8596;&#8629;&#8656;&#8657;&#8658;&#8659;&#8660;&#8704;&#8706;&#8707;&#8709;&#8711;&#8712;&#8713;&#8715;&#8719;&#8721;&#8722;&#8727;&#8730;&#8733;&#8734;&#8736;&#8743;&#8744;&#8745;&#8746;&#8747;&#8756;&#8764;&#8773;&#8776;&#8800;&#8801;&#8804;&#8805;&#8834;&#8835;&#8836;&#8838;&#8839;&#8853;&#8855;&#8869;&#8901;&#8968;&#8969;&#8970;&#8971;&#9001;&#9002;&#9674;&#9824;&#9827;&#9829;&#9830;';
+$str3 = 'a&#338;b&#339;c&#352;d&#353;e&#8364;fg';
+$convmap = array(0x0, 0x2FFFF, 0, 0xFFFF);
+echo mb_decode_numericentity($str1, $convmap, "UTF-8")."\n";
+echo mb_decode_numericentity($str2, $convmap, "UTF-8")."\n";
+echo mb_decode_numericentity($str3, $convmap, "UTF-8")."\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_numericentity.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_decode_numericentity.php.expectf
new file mode 100644
index 000000000..26679f27c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_decode_numericentity.php.expectf
@@ -0,0 +1,3 @@
+臓蔵贈造促側則即息捉束測足速俗属賊族続卒袖其揃存孫尊損村遜他多�����������������������������ﾃ�����������������������������������叩但達辰奪脱巽竪辿棚谷狸鱈樽誰丹単嘆坦担探旦歎淡湛炭短端箪綻耽
+����������������������������������痢裡里離陸律率立留硫粒隆竜龍侶慮旅虜了亮僚両凌����������������������������≒����霞�鰍�鐘�������������≒�汲����������������汲����������������������������������������������������������������р�������������癌�錫����������≠�も�モ����������������������モ����������������������������ｂ�モ��
+a��b��c��d邸e���fg
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_encode_numericentity.php b/hphp/test/zend/good/ext-mbstring/mb_encode_numericentity.php
new file mode 100644
index 000000000..2b5a5ff43
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_encode_numericentity.php
@@ -0,0 +1,10 @@
+<?php
+$str1 = '臓蔵贈造促側則即息捉束測足速俗属賊族続卒袖其揃存孫尊損村遜他多�����������������������������ﾃ�����������������������������������叩但達辰奪脱巽竪辿棚谷狸鱈樽誰丹単嘆坦担探旦歎淡湛炭短端箪綻耽';
+$str2 = '����������������������������������痢裡里離陸律率立留硫粒隆竜龍侶慮旅虜了亮僚両凌����������������������������≒����霞�鰍�鐘�������������≒�汲����������������汲����������������������������������������������������������������р�������������癌�錫����������≠�も�モ����������������������モ����������������������������ｂ�モ��';
+$convmap = array(0x0, 0x2FFFF, 0, 0xFFFF);
+echo mb_encode_numericentity($str1, $convmap, "UTF-8")."\n";
+echo mb_encode_numericentity($str2, $convmap, "UTF-8")."\n";
+
+$convmap = array(0xFF, 0x2FFFF, 0, 0xFFFF);
+echo mb_encode_numericentity('a��b��c��d邸e���fg', $convmap, "UTF-8")."\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_encode_numericentity.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_encode_numericentity.php.expectf
new file mode 100644
index 000000000..541c7698f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_encode_numericentity.php.expectf
@@ -0,0 +1,3 @@
+&#161;&#162;&#163;&#164;&#165;&#166;&#167;&#168;&#169;&#170;&#171;&#172;&#173;&#174;&#175;&#176;&#177;&#178;&#179;&#180;&#181;&#182;&#183;&#184;&#185;&#186;&#187;&#188;&#189;&#190;&#191;&#192;&#193;&#194;&#195;&#196;&#197;&#198;&#199;&#200;&#201;&#202;&#203;&#204;&#205;&#206;&#207;&#208;&#209;&#210;&#211;&#212;&#213;&#214;&#215;&#216;&#217;&#218;&#219;&#220;&#221;&#222;&#223;&#224;&#225;&#226;&#227;&#228;&#229;&#230;&#231;&#232;&#233;&#234;&#235;&#236;&#237;&#238;&#239;&#240;&#241;&#242;&#243;&#244;&#245;&#246;&#247;&#248;&#249;&#250;&#251;&#252;&#253;&#254;&#255;
+&#402;&#913;&#914;&#915;&#916;&#917;&#918;&#919;&#920;&#921;&#922;&#923;&#924;&#925;&#926;&#927;&#928;&#929;&#931;&#932;&#933;&#934;&#935;&#936;&#937;&#945;&#946;&#947;&#948;&#949;&#950;&#951;&#952;&#953;&#954;&#955;&#956;&#957;&#958;&#959;&#960;&#961;&#962;&#963;&#964;&#965;&#966;&#967;&#968;&#969;&#977;&#978;&#982;&#8226;&#8230;&#8242;&#8243;&#8254;&#8260;&#8472;&#8465;&#8476;&#8482;&#8501;&#8592;&#8593;&#8594;&#8595;&#8596;&#8629;&#8656;&#8657;&#8658;&#8659;&#8660;&#8704;&#8706;&#8707;&#8709;&#8711;&#8712;&#8713;&#8715;&#8719;&#8721;&#8722;&#8727;&#8730;&#8733;&#8734;&#8736;&#8743;&#8744;&#8745;&#8746;&#8747;&#8756;&#8764;&#8773;&#8776;&#8800;&#8801;&#8804;&#8805;&#8834;&#8835;&#8836;&#8838;&#8839;&#8853;&#8855;&#8869;&#8901;&#8968;&#8969;&#8970;&#8971;&#9001;&#9002;&#9674;&#9824;&#9827;&#9829;&#9830;
+a&#338;b&#339;c&#352;d&#353;e&#8364;fg
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-01.php b/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-01.php
new file mode 100644
index 000000000..1638cabb2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-01.php
@@ -0,0 +1,10 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/004.phpt) */
+  $a="This is a nice and simple string";
+  if (mb_ereg(".*nice and simple.*",$a)) {
+    echo "ok\n";
+  }
+  if (!mb_ereg(".*doesn't exist.*",$a)) {
+    echo "ok\n";
+  }
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-01.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-01.php.expectf
new file mode 100644
index 000000000..e1252468b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-01.php.expectf
@@ -0,0 +1,2 @@
+ok
+ok
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-02.php b/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-02.php
new file mode 100644
index 000000000..39381c774
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-02.php
@@ -0,0 +1,12 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/005.phpt) */
+  $a="This is a nice and simple string";
+  echo mb_ereg(".*(is).*(is).*",$a,$registers);
+  echo "\n";
+  echo $registers[0];
+  echo "\n";
+  echo $registers[1];
+  echo "\n";
+  echo $registers[2];
+  echo "\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-02.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-02.php.expectf
new file mode 100644
index 000000000..83a97d8ae
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg-compat-02.php.expectf
@@ -0,0 +1,4 @@
+32
+This is a nice and simple string
+is
+is
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_match_basic.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_match_basic.php
new file mode 100644
index 000000000..b9a142ddd
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_match_basic.php
@@ -0,0 +1,35 @@
+<?php
+/* Prototype  : bool mb_ereg_match(string $pattern, string $string [,string $option])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test basic functionality of mb_ereg_match
+ */
+
+mb_internal_encoding('UTF-8');
+mb_regex_encoding('UTF-8');
+
+echo "*** Testing mb_ereg_match() : basic functionality ***\n";
+$string_ascii = b'abc def, 0123456789';
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+//will return true as pattern matches from start of string
+echo "\n-- ASCII string 1 --\n";
+var_dump(mb_ereg_match(b'.*def', $string_ascii));
+
+//will return false as pattern would match half way through string 
+echo "\n-- ASCII string 2 --\n";
+var_dump(mb_ereg_match(b'def', $string_ascii));
+
+echo "\n-- Multibyte string 1 --\n";
+$regex1 = base64_decode('5pel5pys6KqeKC4qKT9bMS05XSs=');
+var_dump(mb_ereg_match($regex1, $string_mb, b'i'));
+
+echo "\n-- Multibyte string 2 --\n";
+$regex2 = base64_decode('5LiW55WM');
+var_dump(mb_ereg_match($regex2, $string_mb));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_match_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_match_basic.php.expectf
new file mode 100644
index 000000000..bf2911362
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_match_basic.php.expectf
@@ -0,0 +1,14 @@
+*** Testing mb_ereg_match() : basic functionality ***
+
+-- ASCII string 1 --
+bool(true)
+
+-- ASCII string 2 --
+bool(false)
+
+-- Multibyte string 1 --
+bool(true)
+
+-- Multibyte string 2 --
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-01.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-01.php
new file mode 100644
index 000000000..29ffbf678
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-01.php
@@ -0,0 +1,5 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/001.phpt) */
+  $a="abc123";
+  echo mb_ereg_replace("123","def",$a);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-01.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-01.php.expectf
new file mode 100644
index 000000000..d96dc9570
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-01.php.expectf
@@ -0,0 +1 @@
+abcdef
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-02.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-02.php
new file mode 100644
index 000000000..a3bd70367
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-02.php
@@ -0,0 +1,5 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/002.phpt) */
+  $a="abc123";
+  echo mb_ereg_replace("123","",$a);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-02.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-02.php.expectf
new file mode 100644
index 000000000..f2ba8f84a
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-02.php.expectf
@@ -0,0 +1 @@
+abc
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-03.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-03.php
new file mode 100644
index 000000000..16bde56d3
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-03.php
@@ -0,0 +1,5 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/003.phpt) */
+  $a="\\'test";
+  echo mb_ereg_replace("\\\\'","'",$a);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-03.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-03.php.expectf
new file mode 100644
index 000000000..0c26c19c1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-03.php.expectf
@@ -0,0 +1 @@
+'test
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-04.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-04.php
new file mode 100644
index 000000000..4be5f832f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-04.php
@@ -0,0 +1,5 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/006.phpt) */
+  $a="This is a nice and simple string";
+  echo mb_ereg_replace("^This","That",$a);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-04.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-04.php.expectf
new file mode 100644
index 000000000..8ce46dab2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-04.php.expectf
@@ -0,0 +1 @@
+That is a nice and simple string
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-05.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-05.php
new file mode 100644
index 000000000..2f519ebdb
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-05.php
@@ -0,0 +1,6 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/007.phpt) */
+  $a="abcd";
+  $b=mb_ereg_replace("abcd","",$a);
+  echo "strlen(\$b)=".strlen($b);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-05.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-05.php.expectf
new file mode 100644
index 000000000..57c4f2a53
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-05.php.expectf
@@ -0,0 +1 @@
+strlen($b)=0
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-06.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-06.php
new file mode 100644
index 000000000..1c4af4e18
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-06.php
@@ -0,0 +1,4 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/008.phpt) */
+  echo mb_ereg_replace("([a-z]*)([-=+|]*)([0-9]+)","\\3 \\1 \\2\n","abc+-|=123");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-06.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-06.php.expectf
new file mode 100644
index 000000000..6091955fe
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-06.php.expectf
@@ -0,0 +1 @@
+123 abc +-|=
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-07.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-07.php
new file mode 100644
index 000000000..1744eb70b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-07.php
@@ -0,0 +1,5 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/010.phpt) */
+  $a="abc122222222223";
+  echo mb_ereg_replace("1(2*)3","\\1def\\1",$a);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-07.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-07.php.expectf
new file mode 100644
index 000000000..1e0346e5b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-07.php.expectf
@@ -0,0 +1 @@
+abc2222222222def2222222222
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-08.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-08.php
new file mode 100644
index 000000000..03f6f49a3
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-08.php
@@ -0,0 +1,5 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/011.phpt) */
+  $a="abc123";
+  echo mb_ereg_replace("123","def\\0ghi",$a);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-08.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-08.php.expectf
new file mode 100644
index 000000000..0a5a4124c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-08.php.expectf
@@ -0,0 +1 @@
+abcdef123ghi
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-09.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-09.php
new file mode 100644
index 000000000..234023a1f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-09.php
@@ -0,0 +1,5 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/012.phpt) */
+  $a="abc123";
+  echo mb_ereg_replace("123",'def\1ghi',$a);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-09.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-09.php.expectf
new file mode 100644
index 000000000..9a5a9325d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-09.php.expectf
@@ -0,0 +1 @@
+abcdef\1ghi
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-10.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-10.php
new file mode 100644
index 000000000..e4fdef09b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-10.php
@@ -0,0 +1,5 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/013.phpt) */
+  $a="abc123";
+  echo mb_ereg_replace("123","def\\g\\\\hi\\",$a);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-10.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-10.php.expectf
new file mode 100644
index 000000000..88f1bbbf9
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-10.php.expectf
@@ -0,0 +1 @@
+abcdef\g\\hi\
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-11.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-11.php
new file mode 100644
index 000000000..1e7f40794
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-11.php
@@ -0,0 +1,5 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/014.phpt) */
+  $a="a\\2bxc";
+  echo mb_ereg_replace("a(.*)b(.*)c","\\1",$a);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-11.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-11.php.expectf
new file mode 100644
index 000000000..7526c59d5
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-11.php.expectf
@@ -0,0 +1 @@
+\2
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-12.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-12.php
new file mode 100644
index 000000000..214555796
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-12.php
@@ -0,0 +1,4 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/015.phpt) */
+  echo mb_ereg_replace("^","z","abc123");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-12.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-12.php.expectf
new file mode 100644
index 000000000..8aced4d6a
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-12.php.expectf
@@ -0,0 +1 @@
+zabc123
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-13.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-13.php
new file mode 100644
index 000000000..ff32d4dce
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-13.php
@@ -0,0 +1,4 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/016.phpt) */
+  echo mb_ereg_replace('\?',"abc","?123?");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-13.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-13.php.expectf
new file mode 100644
index 000000000..6ee49b3dc
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace-compat-13.php.expectf
@@ -0,0 +1 @@
+abc123abc
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace.php
new file mode 100644
index 000000000..77131b56c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace.php
@@ -0,0 +1,5 @@
+<?php
+	mb_regex_set_options( '' );
+	print mb_ereg_replace( ' ', '-', 'a b c d e' )."\n";
+	print mb_ereg_replace( '([a-z]+)','[\\1]', 'abc def ghi' );
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace.php.expectf
new file mode 100644
index 000000000..8b20f0ba6
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace.php.expectf
@@ -0,0 +1,2 @@
+a-b-c-d-e
+[abc] [def] [ghi]
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace_basic.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace_basic.php
new file mode 100644
index 000000000..d79a7cefd
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace_basic.php
@@ -0,0 +1,39 @@
+<?php
+/* Prototype  : string mb_ereg_replace(string $pattern, string $replacement, 
+ * string $string [, string o$ption])
+ * Description: Replace regular expression for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test Basic Functionality of mb_ereg_replace()
+ */
+
+echo "*** Testing mb_ereg_replace() : basic functionality ***\n";
+
+mb_internal_encoding('UTF-8');
+mb_regex_encoding('UTF-8');
+
+$string_ascii = b'abc def';
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+echo "\n-- ASCII string 1 --\n";
+$result_1 = mb_ereg_replace(b'(.*)def', b'\\1 123', $string_ascii);
+var_dump(bin2hex($result_1));
+
+echo "\n-- ASCII string 2 --\n";
+$result_2 = mb_ereg_replace(b'123', b'abc', $string_ascii);
+var_dump(bin2hex($result_2));
+
+echo "\n-- Multibyte string 1 --\n";
+$regex1 = base64_decode('KOaXpeacrOiqnikuKj8oWzEtOV0rKQ==');   //Japanese regex in UTF-8
+$result_3 = mb_ereg_replace($regex1, b'\\1_____\\2', $string_mb);
+var_dump(bin2hex($result_3));
+
+echo "\n-- Multibyte string 2 --\n";
+$regex2 = base64_decode('5LiW55WM');
+$result_4 = mb_ereg_replace($regex2, b'_____', $string_mb);
+var_dump(bin2hex($result_4));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_replace_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace_basic.php.expectf
new file mode 100644
index 000000000..9a97b5ba0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_replace_basic.php.expectf
@@ -0,0 +1,14 @@
+*** Testing mb_ereg_replace() : basic functionality ***
+
+-- ASCII string 1 --
+string(16) "6162632020313233"
+
+-- ASCII string 2 --
+string(14) "61626320646566"
+
+-- Multibyte string 1 --
+string(72) "e697a5e69cace8aa9e5f5f5f5f5f31323334efbc95efbc96efbc97efbc98efbc99e38082"
+
+-- Multibyte string 2 --
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_search.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_search.php
new file mode 100644
index 000000000..9877e71fa
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_search.php
@@ -0,0 +1,25 @@
+<?php
+    $str = "筝����abc + abc ?!鐚�鐚�絖�膃�鐚����china string";
+
+    $reg = "\w+";
+
+    mb_regex_encoding("UTF-8");
+
+    mb_ereg_search_init($str, $reg);
+    $r = mb_ereg_search();
+
+    if(!$r)
+    {
+        echo "null\n";
+    }
+    else
+    {
+        $r = mb_ereg_search_getregs(); //get first result
+        do
+        {
+            var_dump($r[0]);
+            $r = mb_ereg_search_regs();//get next result
+        }
+        while($r);
+    }
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_search.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_search.php.expectf
new file mode 100644
index 000000000..35f6a517c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_search.php.expectf
@@ -0,0 +1,5 @@
+string(9) "筝����abc"
+string(3) "abc"
+string(6) "絖�膃�"
+string(5) "china"
+string(6) "string"
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_variation1.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation1.php
new file mode 100644
index 000000000..fff7dc12e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation1.php
@@ -0,0 +1,83 @@
+<?php
+/* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c 
+ */
+
+/*
+ * Pass different data types to $pattern argument
+ */
+
+echo "*** Testing mb_ereg() : usage variations ***\n";
+
+// Initialise function arguments not being substituted (if any)
+$string = 'string value';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $pattern argument
+$inputs = array(
+
+// int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+// float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+// boolean data
+/*10*/ true,
+       TRUE,
+
+// string data
+/*12*/ "string",
+       'string',
+       $heredoc,
+ 
+// object data
+/*15*/ new classA(),
+
+// resource variable
+/*16*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of mb_ereg()
+$iterator = 1;
+foreach($inputs as $input) {
+	if (@is_array($regs)){
+		$regs = null;
+	}
+	echo "\n-- Iteration $iterator --\n";
+	var_dump( mb_ereg($input, $string, $regs) );
+	var_dump($regs);
+	$iterator++;
+};
+
+fclose($fp);
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_variation1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation1.php.expectf
new file mode 100644
index 000000000..7cd9a5ddf
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation1.php.expectf
@@ -0,0 +1,72 @@
+*** Testing mb_ereg() : usage variations ***
+
+-- Iteration 1 --
+bool(false)
+NULL
+
+-- Iteration 2 --
+bool(false)
+NULL
+
+-- Iteration 3 --
+bool(false)
+NULL
+
+-- Iteration 4 --
+bool(false)
+NULL
+
+-- Iteration 5 --
+bool(false)
+NULL
+
+-- Iteration 6 --
+bool(false)
+NULL
+
+-- Iteration 7 --
+bool(false)
+NULL
+
+-- Iteration 8 --
+bool(false)
+NULL
+
+-- Iteration 9 --
+bool(false)
+NULL
+
+-- Iteration 10 --
+bool(false)
+NULL
+
+-- Iteration 11 --
+bool(false)
+NULL
+
+-- Iteration 12 --
+int(6)
+array(1) {
+  [0]=>
+  string(6) "string"
+}
+
+-- Iteration 13 --
+int(6)
+array(1) {
+  [0]=>
+  string(6) "string"
+}
+
+-- Iteration 14 --
+bool(false)
+NULL
+
+-- Iteration 15 --
+bool(false)
+NULL
+
+-- Iteration 16 --
+bool(false)
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_variation3.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation3.php
new file mode 100644
index 000000000..5d09c46d1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation3.php
@@ -0,0 +1,63 @@
+<?php
+/* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * test that mb_ereg can match correctly when passed different character classes.
+ */
+
+echo "*** Testing mb_ereg() : variation ***\n";
+
+
+mb_regex_encoding('utf-8'); // have to set otherwise won't match $mb properly
+$mb = base64_decode('5pel5pys6Kqe');
+$character_classes = array (b'aB1'    => b'[[:alnum:]]+', /*1*/
+                            b'aBcD'   => b'[[:alpha:]]+',
+                            b'ab/='   => b'[[:ascii:]]+',
+                            b" \t"    => b'[[:blank:]]+',
+                            b'234'    => b'[[:digit:]]+', /*5*/
+                            "$mb"    => b'[[:graph:]]+',
+                            b'fjds'   => b'[[:lower:]]+',
+                            b"$mb\t"  => b'[[:print:]]+',
+                            b'.!"*@'  => b'[[:punct:]]+',
+                            b"\t"     => b'[[:space:]]+', /*10*/
+                            b'IDSJV'  => b'[[:upper:]]+',
+                            b'3b5D'   => b'[[:xdigit:]]+'); /*12*/
+
+$iterator = 1;
+foreach($character_classes as $string => $pattern) {
+	if (is_array(@$regs)) {
+		$regs = null;
+	}
+	// make sure any multibyte output is in base 64
+	echo "\n-- Iteration $iterator --\n";
+	var_dump(mb_ereg($pattern, $string, $regs));
+	base64_encode_var_dump($regs);
+	$iterator++;
+}
+/**
+ * replicate a var dump of an array but outputted string values are base64 encoded
+ *
+ * @param array $regs
+ */
+function base64_encode_var_dump($regs) {
+	if ($regs) {
+		echo "array(" . count($regs) . ") {\n";
+		foreach ($regs as $key => $value) {
+			echo "  [$key]=>\n  ";
+			if (is_string($value)) {
+				var_dump(base64_encode($value));
+			} else {
+				var_dump($value);
+			}
+		}
+		echo "}\n";
+	} else {
+		echo "NULL\n";
+	}
+}
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_variation3.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation3.php.expectf
new file mode 100644
index 000000000..29c4c1d89
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation3.php.expectf
@@ -0,0 +1,86 @@
+*** Testing mb_ereg() : variation ***
+
+-- Iteration 1 --
+int(3)
+array(1) {
+  [0]=>
+  string(4) "YUIx"
+}
+
+-- Iteration 2 --
+int(4)
+array(1) {
+  [0]=>
+  string(8) "YUJjRA=="
+}
+
+-- Iteration 3 --
+int(4)
+array(1) {
+  [0]=>
+  string(8) "YWIvPQ=="
+}
+
+-- Iteration 4 --
+int(2)
+array(1) {
+  [0]=>
+  string(4) "IAk="
+}
+
+-- Iteration 5 --
+int(3)
+array(1) {
+  [0]=>
+  string(4) "MjM0"
+}
+
+-- Iteration 6 --
+int(9)
+array(1) {
+  [0]=>
+  string(12) "5pel5pys6Kqe"
+}
+
+-- Iteration 7 --
+int(4)
+array(1) {
+  [0]=>
+  string(8) "Zmpkcw=="
+}
+
+-- Iteration 8 --
+int(10)
+array(1) {
+  [0]=>
+  string(16) "5pel5pys6KqeCQ=="
+}
+
+-- Iteration 9 --
+int(5)
+array(1) {
+  [0]=>
+  string(8) "LiEiKkA="
+}
+
+-- Iteration 10 --
+int(1)
+array(1) {
+  [0]=>
+  string(4) "CQ=="
+}
+
+-- Iteration 11 --
+int(5)
+array(1) {
+  [0]=>
+  string(8) "SURTSlY="
+}
+
+-- Iteration 12 --
+int(4)
+array(1) {
+  [0]=>
+  string(8) "M2I1RA=="
+}
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_variation4.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation4.php
new file mode 100644
index 000000000..cf263b84e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation4.php
@@ -0,0 +1,67 @@
+<?php
+/* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test how character classes match a multibyte string
+ */
+
+echo "*** Testing mb_ereg() : usage variations ***\n";
+
+mb_regex_encoding('utf-8');
+
+//contains japanese characters, ASCII digits and different, UTF-8 encoded digits
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+$character_classes = array (b'[[:alnum:]]+', /*1*/
+                            b'[[:alpha:]]+',
+                            b'[[:ascii:]]+',
+                            b'[[:blank:]]+',
+                            b'[[:cntrl:]]+',/*5*/
+                            b'[[:digit:]]+',
+                            b'[[:graph:]]+',
+                            b'[[:lower:]]+',
+                            b'[[:print:]]+',
+                            b'[[:punct:]]+', /*10*/
+                            b'[[:space:]]+',
+                            b'[[:upper:]]+',
+                            b'[[:xdigit:]]+'); /*13*/
+
+$iterator = 1;
+foreach ($character_classes as $pattern) {
+	if (is_array(@$regs)) {
+		$regs = null;
+	}
+	echo "\n-- Iteration $iterator --\n";
+	var_dump(mb_ereg($pattern, $string_mb, $regs));
+	if ($regs) {
+		base64_encode_var_dump($regs);
+	}
+	$iterator++;
+}
+/**
+ * replicate a var dump of an array but outputted string values are base64 encoded
+ *
+ * @param array $regs
+ */
+function base64_encode_var_dump($regs) {
+	if ($regs) {
+		echo "array(" . count($regs) . ") {\n";
+		foreach ($regs as $key => $value) {
+			echo "  [$key]=>\n  ";
+			if (is_string($value)) {
+				var_dump(base64_encode($value));
+			} else {
+				var_dump($value);
+			}
+		}
+		echo "}\n";
+	} else {
+		echo "NULL\n";
+	}
+}
+echo "Done";
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_variation4.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation4.php.expectf
new file mode 100644
index 000000000..94492945e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation4.php.expectf
@@ -0,0 +1,73 @@
+*** Testing mb_ereg() : usage variations ***
+
+-- Iteration 1 --
+int(47)
+array(1) {
+  [0]=>
+  string(64) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZMDEyMzTvvJXvvJbvvJfvvJjvvJk="
+}
+
+-- Iteration 2 --
+int(27)
+array(1) {
+  [0]=>
+  string(36) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ"
+}
+
+-- Iteration 3 --
+int(5)
+array(1) {
+  [0]=>
+  string(8) "MDEyMzQ="
+}
+
+-- Iteration 4 --
+bool(false)
+
+-- Iteration 5 --
+bool(false)
+
+-- Iteration 6 --
+int(20)
+array(1) {
+  [0]=>
+  string(28) "MDEyMzTvvJXvvJbvvJfvvJjvvJk="
+}
+
+-- Iteration 7 --
+int(50)
+array(1) {
+  [0]=>
+  string(68) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+}
+
+-- Iteration 8 --
+bool(false)
+
+-- Iteration 9 --
+int(50)
+array(1) {
+  [0]=>
+  string(68) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+}
+
+-- Iteration 10 --
+int(3)
+array(1) {
+  [0]=>
+  string(4) "44CC"
+}
+
+-- Iteration 11 --
+bool(false)
+
+-- Iteration 12 --
+bool(false)
+
+-- Iteration 13 --
+int(5)
+array(1) {
+  [0]=>
+  string(8) "MDEyMzQ="
+}
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_variation6.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation6.php
new file mode 100644
index 000000000..b96111eb2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation6.php
@@ -0,0 +1,71 @@
+<?php
+/* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test how mb_ereg() matches special characters for $pattern
+ */
+
+echo "*** Testing mb_ereg() : usage variations ***\n";
+
+if(mb_regex_encoding('utf-8') == true) {
+	echo "Regex encoding set to utf-8\n";
+} else {
+	echo "Could not set regex encoding to utf-8\n";
+}
+
+$regex_char = array ('\w+' => b'\w+', 
+                     '\W+' => b'\W+', 
+                     '\s+' => b'\s+', 
+                     '\S+' => b'\S+', 
+                     '\d+' => b'\d+', 
+                     '\D+' => b'\D+', 
+                     '\b' =>  b'\b', 
+                     '\B' =>  b'\B');
+
+$string_ascii = b'This is an English string. 0123456789.';
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+foreach ($regex_char as $displayChar => $char) {
+	echo "\n--** Pattern is: $displayChar **--\n";
+	if (@$regs_ascii || @$regs_mb) {
+		$regs_ascii = null;
+		$regs_mb = null;
+	}
+	echo "-- ASCII String: --\n";
+	var_dump(mb_ereg($char, $string_ascii, $regs_ascii));
+	base64_encode_var_dump($regs_ascii);
+
+	echo "-- Multibyte String: --\n";
+	var_dump(mb_ereg($char, $string_mb, $regs_mb));
+	base64_encode_var_dump($regs_mb);
+
+}
+
+/**
+ * replicate a var dump of an array but outputted string values are base64 encoded
+ *
+ * @param array $regs
+ */
+function base64_encode_var_dump($regs) {
+	if ($regs) {
+		echo "array(" . count($regs) . ") {\n";
+		foreach ($regs as $key => $value) {
+			echo "  [$key]=>\n  ";
+			if (is_string($value)) {
+				var_dump(base64_encode($value));
+			} else {
+				var_dump($value);
+			}
+		}
+		echo "}\n";
+	} else {
+		echo "NULL\n";
+	}
+}
+
+echo "Done";
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_variation6.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation6.php.expectf
new file mode 100644
index 000000000..8d4b951ad
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation6.php.expectf
@@ -0,0 +1,112 @@
+*** Testing mb_ereg() : usage variations ***
+Regex encoding set to utf-8
+
+--** Pattern is: \w+ **--
+-- ASCII String: --
+int(4)
+array(1) {
+  [0]=>
+  string(8) "VGhpcw=="
+}
+-- Multibyte String: --
+int(27)
+array(1) {
+  [0]=>
+  string(36) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ"
+}
+
+--** Pattern is: \W+ **--
+-- ASCII String: --
+int(1)
+array(1) {
+  [0]=>
+  string(4) "IA=="
+}
+-- Multibyte String: --
+int(3)
+array(1) {
+  [0]=>
+  string(4) "44CC"
+}
+
+--** Pattern is: \s+ **--
+-- ASCII String: --
+int(1)
+array(1) {
+  [0]=>
+  string(4) "IA=="
+}
+-- Multibyte String: --
+bool(false)
+NULL
+
+--** Pattern is: \S+ **--
+-- ASCII String: --
+int(4)
+array(1) {
+  [0]=>
+  string(8) "VGhpcw=="
+}
+-- Multibyte String: --
+int(53)
+array(1) {
+  [0]=>
+  string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+}
+
+--** Pattern is: \d+ **--
+-- ASCII String: --
+int(10)
+array(1) {
+  [0]=>
+  string(16) "MDEyMzQ1Njc4OQ=="
+}
+-- Multibyte String: --
+int(20)
+array(1) {
+  [0]=>
+  string(28) "MDEyMzTvvJXvvJbvvJfvvJjvvJk="
+}
+
+--** Pattern is: \D+ **--
+-- ASCII String: --
+int(27)
+array(1) {
+  [0]=>
+  string(36) "VGhpcyBpcyBhbiBFbmdsaXNoIHN0cmluZy4g"
+}
+-- Multibyte String: --
+int(30)
+array(1) {
+  [0]=>
+  string(40) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC"
+}
+
+--** Pattern is: \b **--
+-- ASCII String: --
+int(1)
+array(1) {
+  [0]=>
+  bool(false)
+}
+-- Multibyte String: --
+int(1)
+array(1) {
+  [0]=>
+  bool(false)
+}
+
+--** Pattern is: \B **--
+-- ASCII String: --
+int(1)
+array(1) {
+  [0]=>
+  bool(false)
+}
+-- Multibyte String: --
+int(1)
+array(1) {
+  [0]=>
+  bool(false)
+}
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_variation7.php b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation7.php
new file mode 100644
index 000000000..629275aa1
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation7.php
@@ -0,0 +1,56 @@
+<?php
+/* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
+ * Description: Regular expression match for multibyte string 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Testing the following regular expression features match correctly:
+ * 1. definite quantifiers
+ * 2. Alternation
+ * 3. subpatterns in parentheses
+ */
+
+echo "*** Testing mb_ereg() : usage variations ***\n";
+
+if(mb_regex_encoding('utf-8') == true) {
+	echo "Regex encoding set to utf-8\n";
+} else {
+	echo "Could not set regex encoding to utf-8\n";
+}
+
+$string_ascii = b'This is an English string. 0123456789.';
+$regex_ascii = b'([A-Z]\w{1,4}is( [aeiou]|h)) ?.*\.\s[0-9]+(5([6-9][79]){2})[[:punct:]]$';
+var_dump(mb_ereg($regex_ascii, $string_ascii, $regs_ascii));
+base64_encode_var_dump($regs_ascii);
+
+$string_mb = base64_decode('zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg==');
+$regex_mb = base64_decode("W86RLc6pXShcdysgKSvOtVvOsS3PiVxzXSvOui4qKM+MfM6/KS4qXC5cc1swLTldKyg1KFs2LTldWzc5XSl7Mn0pW1s6cHVuY3Q6XV0k");
+var_dump(mb_ereg($regex_mb, $string_mb, $regs_mb));
+base64_encode_var_dump($regs_mb);
+
+/**
+ * replicate a var dump of an array but outputted string values are base64 encoded
+ *
+ * @param array $regs
+ */
+function base64_encode_var_dump($regs) {
+	if ($regs) {
+		echo "array(" . count($regs) . ") {\n";
+		foreach ($regs as $key => $value) {
+			echo "  [$key]=>\n  ";
+			if (is_string($value)) {
+				var_dump(base64_encode($value));
+			} else {
+				var_dump($value);
+			}
+		}
+		echo "}\n";
+	} else {
+		echo "NULL\n";
+	}
+}
+
+echo "Done";
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_ereg_variation7.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation7.php.expectf
new file mode 100644
index 000000000..f0731ab92
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_ereg_variation7.php.expectf
@@ -0,0 +1,29 @@
+*** Testing mb_ereg() : usage variations ***
+Regex encoding set to utf-8
+int(38)
+array(5) {
+  [0]=>
+  string(52) "VGhpcyBpcyBhbiBFbmdsaXNoIHN0cmluZy4gMDEyMzQ1Njc4OS4="
+  [1]=>
+  string(8) "VGhpcyBp"
+  [2]=>
+  string(4) "IGk="
+  [3]=>
+  string(8) "NTY3ODk="
+  [4]=>
+  string(4) "ODk="
+}
+int(64)
+array(5) {
+  [0]=>
+  string(88) "zpHPhc+Ez4wgzrXOr869zrHOuSDOtc67zrvOt869zrnOus+MIM66zrXOr868zrXOvc6/LiAwMTIzNDU2Nzg5Lg=="
+  [1]=>
+  string(16) "zrXOr869zrHOuSA="
+  [2]=>
+  string(4) "zr8="
+  [3]=>
+  string(8) "NTY3ODk="
+  [4]=>
+  string(4) "ODk="
+}
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_eregi_replace.php b/hphp/test/zend/good/ext-mbstring/mb_eregi_replace.php
new file mode 100644
index 000000000..814b25d52
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_eregi_replace.php
@@ -0,0 +1,25 @@
+<?php
+function do_translit($st) {
+    $replacement = array(
+        "亶"=>"i","��"=>"c","��"=>"u","从"=>"k","亠"=>"e","仆"=>"n",
+        "亞"=>"g","��"=>"sh","��"=>"sh","亰"=>"z","��"=>"x","��"=>"\'",
+        "��"=>"f","��"=>"i","于"=>"v","舒"=>"a","仗"=>"p","��"=>"r",
+        "仂"=>"o","仍"=>"l","亟"=>"d","亢"=>"zh","��"=>"ie","��"=>"e",
+        "��"=>"ya","��"=>"ch","��"=>"c","仄"=>"m","亳"=>"i","��"=>"t",
+        "��"=>"\'","弍"=>"b","��"=>"yu",
+        "��"=>"I","丶"=>"C","丕"=>"U","��"=>"K","��"=>"E","��"=>"N",
+        "��"=>"G","丿"=>"SH","乂"=>"SH","��"=>"Z","丱"=>"X","乖"=>"\'",
+        "个"=>"F","乘"=>"I","��"=>"V","��"=>"A","��"=>"P","��"=>"R",
+        "��"=>"O","��"=>"L","��"=>"D","��"=>"ZH","亅"=>"IE","��"=>"E",
+        "亊"=>"YA","丼"=>"CH","弌"=>"C","��"=>"M","��"=>"I","丐"=>"T",
+        "亂"=>"\'","��"=>"B","豫"=>"YU",
+    );
+   
+    foreach($replacement as $i=>$u) {
+        $st = mb_eregi_replace($i,$u,$st);
+    }
+    return $st;
+} 
+
+echo do_translit("��亠舒��");
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_eregi_replace.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_eregi_replace.php.expectf
new file mode 100644
index 000000000..0142d0c6c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_eregi_replace.php.expectf
@@ -0,0 +1 @@
+Pear
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_basic.php b/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_basic.php
new file mode 100644
index 000000000..78d3124d0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_basic.php
@@ -0,0 +1,22 @@
+<?php
+/* Prototype  : string mb_internal_encoding([string $encoding])
+ * Description: Sets the current internal encoding or Returns 
+ * the current internal encoding as a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test basic functionality of mb_internal_encoding
+ */
+
+echo "*** Testing mb_internal_encoding() : basic functionality ***\n";
+
+var_dump(mb_internal_encoding());   //default internal encoding
+
+var_dump(mb_internal_encoding('UTF-8'));    //change internal encoding to UTF-8
+
+var_dump(mb_internal_encoding());    //check internal encoding is now set to UTF-8
+
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_basic.php.expectf
new file mode 100644
index 000000000..6f2150990
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_basic.php.expectf
@@ -0,0 +1,5 @@
+*** Testing mb_internal_encoding() : basic functionality ***
+string(%d) "%s"
+bool(true)
+string(5) "UTF-8"
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php b/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php
new file mode 100644
index 000000000..f86d29711
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php
@@ -0,0 +1,17 @@
+<?php
+/* Prototype  : string mb_internal_encoding([string $encoding])
+ * Description: Sets the current internal encoding or 
+ * Returns the current internal encoding as a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_internal_encoding an unknown encoding
+ */
+
+echo "*** Testing mb_internal_encoding() : error conditions ***\n";
+
+var_dump(mb_internal_encoding('unknown-encoding'));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php.expectf
new file mode 100644
index 000000000..99efa1440
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_internal_encoding() : error conditions ***
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_list_encodings.php b/hphp/test/zend/good/ext-mbstring/mb_list_encodings.php
new file mode 100644
index 000000000..1b4ffad67
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_list_encodings.php
@@ -0,0 +1,6 @@
+<?php
+var_dump(in_array("7bit", mb_list_encodings()));
+var_dump(in_array("8bit", mb_list_encodings()));
+var_dump(in_array("ASCII", mb_list_encodings()));
+var_dump(in_array("non-existent", mb_list_encodings()));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_list_encodings.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_list_encodings.php.expectf
new file mode 100644
index 000000000..7a2f36777
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_list_encodings.php.expectf
@@ -0,0 +1,4 @@
+bool(true)
+bool(true)
+bool(true)
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_output_handler_euc_jp.php b/hphp/test/zend/good/ext-mbstring/mb_output_handler_euc_jp.php
new file mode 100644
index 000000000..5436bae09
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_output_handler_euc_jp.php
@@ -0,0 +1,13 @@
+<?php
+// TODO: Do real test
+
+// EUC-JP
+$euc_jp = "テスト用日本語文字列。このモジュールはPHPにマルチバイト関数を提供します。";
+mb_http_output('EUC-JP') or print("mb_http_output() failed\n");
+ob_start('mb_output_handler');
+echo $euc_jp;
+$output = ob_get_clean();
+
+var_dump( $output );
+
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_output_handler_euc_jp.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_output_handler_euc_jp.php.expectf
new file mode 100644
index 000000000..801fa16fd
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_output_handler_euc_jp.php.expectf
@@ -0,0 +1 @@
+string(73) "テスト用日本語文字列。このモジュールはPHPにマルチバイト関数を提供します。"
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_preferred_mime_name.php b/hphp/test/zend/good/ext-mbstring/mb_preferred_mime_name.php
new file mode 100644
index 000000000..eb183feb4
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_preferred_mime_name.php
@@ -0,0 +1,41 @@
+<?php
+// TODO: Add more encoding names
+
+//$debug=true;
+ini_set('include_path', dirname(__FILE__));
+include_once('common.inc');
+
+
+$str = mb_preferred_mime_name('sjis-win');
+echo "$str\n";
+
+$str = mb_preferred_mime_name('SJIS');
+echo "$str\n";
+
+$str = mb_preferred_mime_name('EUC-JP');
+echo "$str\n";
+
+$str = mb_preferred_mime_name('UTF-8');
+echo "$str\n";
+
+$str = mb_preferred_mime_name('ISO-2022-JP');
+echo "$str\n";
+
+$str = mb_preferred_mime_name('JIS');
+echo "$str\n";
+
+$str = mb_preferred_mime_name('ISO-8859-1');
+echo "$str\n";
+
+$str = mb_preferred_mime_name('UCS2');
+echo "$str\n";
+
+$str = mb_preferred_mime_name('UCS4');
+echo "$str\n";
+
+echo "== INVALID PARAMETER ==\n";
+// Invalid name
+$r = mb_preferred_mime_name('BAD_NAME');
+($r === FALSE) ? print("OK_BAD_NAME\n") : print("NG_BAD_NAME\n");
+
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_preferred_mime_name.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_preferred_mime_name.php.expectf
new file mode 100644
index 000000000..18f46065b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_preferred_mime_name.php.expectf
@@ -0,0 +1,12 @@
+Shift_JIS
+Shift_JIS
+EUC-JP
+UTF-8
+ISO-2022-JP
+ISO-2022-JP
+ISO-8859-1
+UCS-2
+UCS-4
+== INVALID PARAMETER ==
+ERR: Warning
+OK_BAD_NAME
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_basic.php b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_basic.php
new file mode 100644
index 000000000..c1d8afe62
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_basic.php
@@ -0,0 +1,21 @@
+<?php
+/* Prototype  : proto string mb_regex_encoding([string encoding])
+ * Description: Returns the current encoding for regex as a string. 
+ * Source code: ext/mbstring/php_mbregex.c 
+ */
+
+/*
+ * Test Basic functionality of mb_regex_encoding
+ */
+
+echo "*** Testing mb_regex_encoding() : basic functionality ***\n";
+
+var_dump(mb_regex_encoding());
+
+var_dump(mb_regex_encoding('UTF-8'));
+
+var_dump(mb_regex_encoding());
+
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_basic.php.expectf
new file mode 100644
index 000000000..00525c3c3
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_basic.php.expectf
@@ -0,0 +1,5 @@
+*** Testing mb_regex_encoding() : basic functionality ***
+string(%d) "%s"
+bool(true)
+string(5) "UTF-8"
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php
new file mode 100644
index 000000000..61b0a68bb
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php
@@ -0,0 +1,20 @@
+<?php
+/* Prototype  : string mb_regex_encoding([string $encoding])
+ * Description: Returns the current encoding for regex as a string. 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test mb_regex_encoding with one more than expected number of arguments
+ */
+
+echo "*** Testing mb_regex_encoding() : error conditions ***\n";
+
+
+echo "\n-- Testing mb_regex_encoding() function with more than expected no. of arguments --\n";
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_regex_encoding($encoding, $extra_arg) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php.expectf
new file mode 100644
index 000000000..519410089
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php.expectf
@@ -0,0 +1,6 @@
+*** Testing mb_regex_encoding() : error conditions ***
+
+-- Testing mb_regex_encoding() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php
new file mode 100644
index 000000000..40ef5b842
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php
@@ -0,0 +1,17 @@
+<?php
+/* Prototype  : string mb_regex_encoding([string $encoding])
+ * Description: Returns the current encoding for regex as a string. 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Pass mb_regex_encoding an unknown type of encoding
+ */
+
+echo "*** Testing mb_regex_encoding() : error conditions ***\n";
+
+var_dump(mb_regex_encoding('unknown'));
+
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php.expectf
new file mode 100644
index 000000000..9e2c242fc
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_regex_encoding() : error conditions ***
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php
new file mode 100644
index 000000000..06d68ee75
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php
@@ -0,0 +1,81 @@
+<?php
+/* Prototype  : string mb_regex_encoding([string $encoding])
+ * Description: Returns the current encoding for regex as a string. 
+ * Source code: ext/mbstring/php_mbregex.c
+ */
+
+/*
+ * Test all listed encoding types from php.net to check all are known to function
+ * NB: The strings passed are *NOT* necessarily encoded in the encoding passed to the function.
+ * This test is purely to see whether the function recognises the encoding.
+ */
+
+echo "*** Testing mb_regex_encoding() : usage variations ***\n";
+
+$encoding = array('UCS-4',			/*1*/
+                  'UCS-4BE',
+                  'UCS-4LE',
+                  'UCS-2',
+                  'UCS-2BE',		/*5*/
+                  'UCS-2LE',
+                  'UTF-32',
+                  'UTF-32BE',
+                  'UTF-32LE',
+                  'UTF-16',			/*10*/
+                  'UTF-16BE',
+                  'UTF-16LE',
+                  'UTF-7',
+                  'UTF7-IMAP',
+                  'UTF-8',			/*15*/
+                  'ASCII',
+                  'EUC-JP',
+                  'SJIS',
+                  'eucJP-win',
+                  'SJIS-win',		/*20*/
+                  'ISO-2022-JP',
+                  'JIS',
+                  'ISO-8859-1',
+                  'ISO-8859-2',
+                  'ISO-8859-3',		/*25*/
+                  'ISO-8859-4',
+                  'ISO-8859-5',
+                  'ISO-8859-6',
+                  'ISO-8859-7',
+                  'ISO-8859-8',		/*30*/
+                  'ISO-8859-9',
+                  'ISO-8859-10',
+                  'ISO-8859-13',
+                  'ISO-8859-14',
+                  'ISO-8859-15',	/*35*/
+                  'byte2be',
+                  'byte2le',
+                  'byte4be',
+                  'byte4le',
+                  'BASE64',			/*40*/
+                  'HTML-ENTITIES',
+                  '7bit',
+                  '8bit',
+                  'EUC-CN',
+                  'CP936',			/*45*/
+                  'HZ',
+                  'EUC-TW',
+                  'CP950',
+                  'BIG-5',
+                  'EUC-KR',			/*50*/
+                  'UHC',
+                  'ISO-2022-KR',
+                  'Windows-1251',
+                  'Windows-1252',
+                  'CP866',			/*55*/
+                  'KOI8-R');		/*56*/
+
+$iterator = 1;
+foreach($encoding as $enc) {
+	echo "\n-- Iteration $iterator --\n";
+	var_dump(mb_regex_encoding());
+	var_dump(mb_regex_encoding($enc));
+	var_dump(mb_regex_encoding());
+	$iterator++;
+}
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php.expectf
new file mode 100644
index 000000000..804850c7c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php.expectf
@@ -0,0 +1,306 @@
+*** Testing mb_regex_encoding() : usage variations ***
+
+-- Iteration 1 --
+string(%d) "%s"
+bool(true)
+string(5) "UCS-4"
+
+-- Iteration 2 --
+string(5) "UCS-4"
+HipHop Warning: %a
+bool(false)
+string(5) "UCS-4"
+
+-- Iteration 3 --
+string(5) "UCS-4"
+bool(true)
+string(7) "UCS-4LE"
+
+-- Iteration 4 --
+string(7) "UCS-4LE"
+HipHop Warning: %a
+bool(false)
+string(7) "UCS-4LE"
+
+-- Iteration 5 --
+string(7) "UCS-4LE"
+HipHop Warning: %a
+bool(false)
+string(7) "UCS-4LE"
+
+-- Iteration 6 --
+string(7) "UCS-4LE"
+HipHop Warning: %a
+bool(false)
+string(7) "UCS-4LE"
+
+-- Iteration 7 --
+string(7) "UCS-4LE"
+bool(true)
+string(5) "UCS-4"
+
+-- Iteration 8 --
+string(5) "UCS-4"
+bool(true)
+string(5) "UCS-4"
+
+-- Iteration 9 --
+string(5) "UCS-4"
+bool(true)
+string(7) "UCS-4LE"
+
+-- Iteration 10 --
+string(7) "UCS-4LE"
+bool(true)
+string(6) "UTF-16"
+
+-- Iteration 11 --
+string(6) "UTF-16"
+bool(true)
+string(6) "UTF-16"
+
+-- Iteration 12 --
+string(6) "UTF-16"
+bool(true)
+string(8) "UTF-16LE"
+
+-- Iteration 13 --
+string(8) "UTF-16LE"
+HipHop Warning: %a
+bool(false)
+string(8) "UTF-16LE"
+
+-- Iteration 14 --
+string(8) "UTF-16LE"
+HipHop Warning: %a
+bool(false)
+string(8) "UTF-16LE"
+
+-- Iteration 15 --
+string(8) "UTF-16LE"
+bool(true)
+string(5) "UTF-8"
+
+-- Iteration 16 --
+string(5) "UTF-8"
+bool(true)
+string(5) "ASCII"
+
+-- Iteration 17 --
+string(5) "ASCII"
+bool(true)
+string(6) "EUC-JP"
+
+-- Iteration 18 --
+string(6) "EUC-JP"
+bool(true)
+string(4) "SJIS"
+
+-- Iteration 19 --
+string(4) "SJIS"
+bool(true)
+string(6) "EUC-JP"
+
+-- Iteration 20 --
+string(6) "EUC-JP"
+bool(true)
+string(4) "SJIS"
+
+-- Iteration 21 --
+string(4) "SJIS"
+HipHop Warning: %a
+bool(false)
+string(4) "SJIS"
+
+-- Iteration 22 --
+string(4) "SJIS"
+HipHop Warning: %a
+bool(false)
+string(4) "SJIS"
+
+-- Iteration 23 --
+string(4) "SJIS"
+bool(true)
+string(10) "ISO-8859-1"
+
+-- Iteration 24 --
+string(10) "ISO-8859-1"
+bool(true)
+string(10) "ISO-8859-2"
+
+-- Iteration 25 --
+string(10) "ISO-8859-2"
+bool(true)
+string(10) "ISO-8859-3"
+
+-- Iteration 26 --
+string(10) "ISO-8859-3"
+bool(true)
+string(10) "ISO-8859-4"
+
+-- Iteration 27 --
+string(10) "ISO-8859-4"
+bool(true)
+string(10) "ISO-8859-5"
+
+-- Iteration 28 --
+string(10) "ISO-8859-5"
+bool(true)
+string(10) "ISO-8859-6"
+
+-- Iteration 29 --
+string(10) "ISO-8859-6"
+bool(true)
+string(10) "ISO-8859-7"
+
+-- Iteration 30 --
+string(10) "ISO-8859-7"
+bool(true)
+string(10) "ISO-8859-8"
+
+-- Iteration 31 --
+string(10) "ISO-8859-8"
+bool(true)
+string(10) "ISO-8859-9"
+
+-- Iteration 32 --
+string(10) "ISO-8859-9"
+bool(true)
+string(11) "ISO-8859-10"
+
+-- Iteration 33 --
+string(11) "ISO-8859-10"
+bool(true)
+string(11) "ISO-8859-13"
+
+-- Iteration 34 --
+string(11) "ISO-8859-13"
+bool(true)
+string(11) "ISO-8859-14"
+
+-- Iteration 35 --
+string(11) "ISO-8859-14"
+bool(true)
+string(11) "ISO-8859-15"
+
+-- Iteration 36 --
+string(11) "ISO-8859-15"
+HipHop Warning: %a
+bool(false)
+string(11) "ISO-8859-15"
+
+-- Iteration 37 --
+string(11) "ISO-8859-15"
+HipHop Warning: %a
+bool(false)
+string(11) "ISO-8859-15"
+
+-- Iteration 38 --
+string(11) "ISO-8859-15"
+HipHop Warning: %a
+bool(false)
+string(11) "ISO-8859-15"
+
+-- Iteration 39 --
+string(11) "ISO-8859-15"
+HipHop Warning: %a
+bool(false)
+string(11) "ISO-8859-15"
+
+-- Iteration 40 --
+string(11) "ISO-8859-15"
+HipHop Warning: %a
+bool(false)
+string(11) "ISO-8859-15"
+
+-- Iteration 41 --
+string(11) "ISO-8859-15"
+HipHop Warning: %a
+bool(false)
+string(11) "ISO-8859-15"
+
+-- Iteration 42 --
+string(11) "ISO-8859-15"
+HipHop Warning: %a
+bool(false)
+string(11) "ISO-8859-15"
+
+-- Iteration 43 --
+string(11) "ISO-8859-15"
+HipHop Warning: %a
+bool(false)
+string(11) "ISO-8859-15"
+
+-- Iteration 44 --
+string(11) "ISO-8859-15"
+bool(true)
+string(6) "EUC-CN"
+
+-- Iteration 45 --
+string(6) "EUC-CN"
+HipHop Warning: %a
+bool(false)
+string(6) "EUC-CN"
+
+-- Iteration 46 --
+string(6) "EUC-CN"
+HipHop Warning: %a
+bool(false)
+string(6) "EUC-CN"
+
+-- Iteration 47 --
+string(6) "EUC-CN"
+bool(true)
+string(6) "EUC-TW"
+
+-- Iteration 48 --
+string(6) "EUC-TW"
+HipHop Warning: %a
+bool(false)
+string(6) "EUC-TW"
+
+-- Iteration 49 --
+string(6) "EUC-TW"
+bool(true)
+string(4) "BIG5"
+
+-- Iteration 50 --
+string(4) "BIG5"
+bool(true)
+string(6) "EUC-KR"
+
+-- Iteration 51 --
+string(6) "EUC-KR"
+HipHop Warning: %a
+bool(false)
+string(6) "EUC-KR"
+
+-- Iteration 52 --
+string(6) "EUC-KR"
+HipHop Warning: %a
+bool(false)
+string(6) "EUC-KR"
+
+-- Iteration 53 --
+string(6) "EUC-KR"
+HipHop Warning: %a
+bool(false)
+string(6) "EUC-KR"
+
+-- Iteration 54 --
+string(6) "EUC-KR"
+HipHop Warning: %a
+bool(false)
+string(6) "EUC-KR"
+
+-- Iteration 55 --
+string(6) "EUC-KR"
+HipHop Warning: %a
+bool(false)
+string(6) "EUC-KR"
+
+-- Iteration 56 --
+string(6) "EUC-KR"
+bool(true)
+string(5) "KOI8R"
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_split-compat-01.php b/hphp/test/zend/good/ext-mbstring/mb_split-compat-01.php
new file mode 100644
index 000000000..5c543cc2a
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_split-compat-01.php
@@ -0,0 +1,9 @@
+<?php
+/* (counterpart: ext/standard/tests/reg/009.phpt) */
+	$a=mb_split("[[:space:]]","this is	a
+test");
+	echo count($a) . "\n";
+	for ($i = 0; $i < count($a); $i++) {
+          echo $a[$i] . "\n";
+        }
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_split-compat-01.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_split-compat-01.php.expectf
new file mode 100644
index 000000000..efc3568e7
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_split-compat-01.php.expectf
@@ -0,0 +1,5 @@
+4
+this
+is
+a
+test
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strcut_missing_boundary_check.php b/hphp/test/zend/good/ext-mbstring/mb_strcut_missing_boundary_check.php
new file mode 100644
index 000000000..dfc9cb8bd
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strcut_missing_boundary_check.php
@@ -0,0 +1,15 @@
+<?php
+mb_internal_encoding("UCS-4LE");
+var_dump(bin2hex(mb_strcut("\x61\x00\x00\x00\x62\x00\x00\x00\x63\x00\x00\x00", 0, 32)));
+mb_internal_encoding("UCS-4BE");
+var_dump(bin2hex(mb_strcut("\x00\x00\x00\x61\x00\x00\x00\x62\x00\x00\x00\x63", 0, 32)));
+mb_internal_encoding("UCS-2LE");
+var_dump(bin2hex(mb_strcut("\x61\x00\x62\x00\x63\x00", 0, 32)));
+mb_internal_encoding("UCS-2BE");
+var_dump(bin2hex(mb_strcut("\x00\x61\x00\x62\x00\x63", 0, 32)));
+mb_internal_encoding("UTF-16");
+var_dump(bin2hex(mb_strcut("\x00\x61\x00\x62\x00\x63", 0, 32)));
+mb_internal_encoding("UTF-8");
+var_dump(bin2hex(mb_strcut("abc", 0, 32)));
+mb_internal_encoding("ISO-8859-1");
+var_dump(bin2hex(mb_strcut("abc", 0, 32)));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strcut_missing_boundary_check.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strcut_missing_boundary_check.php.expectf
new file mode 100644
index 000000000..e25e51689
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strcut_missing_boundary_check.php.expectf
@@ -0,0 +1,7 @@
+string(24) "610000006200000063000000"
+string(24) "000000610000006200000063"
+string(12) "610062006300"
+string(12) "006100620063"
+string(12) "006100620063"
+string(6) "616263"
+string(6) "616263"
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stripos_basic.php b/hphp/test/zend/good/ext-mbstring/mb_stripos_basic.php
new file mode 100644
index 000000000..f62714740
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stripos_basic.php
@@ -0,0 +1,91 @@
+<?php
+/* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Test basic functionality of mb_stripos with ASCII and multibyte characters
+ */
+
+echo "*** Testing mb_stripos() : basic functionality***\n";
+
+mb_internal_encoding('UTF-8');
+
+//ascii strings
+$ascii_haystacks = array(
+   b'abc defabc   def',
+   b'ABC DEFABC   DEF',
+   b'Abc dEFaBC   Def',
+);
+
+$ascii_needles = array(
+   // 4 good ones
+   b'DE',
+   b'de',
+   b'De',
+   b'dE',
+   
+   //flag a swap between good and bad
+   '!', 
+   
+   // 4 bad ones
+   b'df',
+   b'Df',
+   b'dF', 
+   b'DF'
+);
+
+//greek strings in UTF-8
+$greek_lower = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J');
+$greek_upper = base64_decode('zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p');
+$greek_mixed = base64_decode('zrHOss6TzpTOlc6WzpfOmM65zrrOu868zr3Ovs6fzqDOoc6jzqTOpc+Gz4fPiM+J');
+$greek_haystacks = array($greek_lower, $greek_upper, $greek_mixed);
+
+$greek_nlower = base64_decode('zrzOvc6+zr8=');
+$greek_nupper = base64_decode('zpzOnc6ezp8=');
+$greek_nmixed1 = base64_decode('zpzOnc6+zr8=');
+$greek_nmixed2 = base64_decode('zrzOvc6+zp8=');
+
+$greek_blower = base64_decode('zpzOns6f');
+$greek_bupper = base64_decode('zrzOvs6/');
+$greek_bmixed1 = base64_decode('zpzOvs6/');
+$greek_bmixed2 = base64_decode('zrzOvs6f');
+$greek_needles = array(
+   // 4 good ones
+   $greek_nlower, $greek_nupper, $greek_nmixed1, $greek_nmixed2,
+   
+   '!', // used to flag a swap between good and bad
+   
+   // 4 bad ones
+   $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2,   
+);
+
+// try the basic options
+echo "\n -- ASCII Strings, needle should be found --\n";
+foreach ($ascii_needles as $needle) {
+   if ($needle == '!') {
+      echo "\n -- ASCII Strings, needle should not be found --\n";
+   }
+   else {
+      foreach ($ascii_haystacks as $haystack) {
+         var_dump(mb_stripos($haystack, $needle));
+      }
+   }   
+}
+
+echo "\n -- Greek Strings, needle should be found --\n";
+foreach ($greek_needles as $needle) {
+   if ($needle == '!') {
+      echo "\n -- ASCII Strings, needle should not be found --\n";
+   }
+   else {
+      foreach ($greek_haystacks as $haystack) {
+         var_dump(mb_stripos($haystack, $needle));
+      }
+   }   
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stripos_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_stripos_basic.php.expectf
new file mode 100644
index 000000000..c4a7e3376
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stripos_basic.php.expectf
@@ -0,0 +1,58 @@
+*** Testing mb_stripos() : basic functionality***
+
+ -- ASCII Strings, needle should be found --
+int(4)
+int(4)
+int(4)
+int(4)
+int(4)
+int(4)
+int(4)
+int(4)
+int(4)
+int(4)
+int(4)
+int(4)
+
+ -- ASCII Strings, needle should not be found --
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+
+ -- Greek Strings, needle should be found --
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+
+ -- ASCII Strings, needle should not be found --
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stripos_basic2.php b/hphp/test/zend/good/ext-mbstring/mb_stripos_basic2.php
new file mode 100644
index 000000000..d5b67d40f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stripos_basic2.php
@@ -0,0 +1,65 @@
+<?php
+/* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Test basic functionality of mb_stripos with ASCII and multibyte characters
+ */
+
+echo "*** Testing mb_stripos() : basic functionality***\n";
+
+mb_internal_encoding('UTF-8');
+
+//ascii strings
+$ascii_haystacks = array(
+   b'abc defabc   def',
+   b'ABC DEFABC   DEF',
+   b'Abc dEFaBC   Def',
+);
+
+$ascii_needles = array(
+   // 4 good ones
+   b'DE',
+   b'de',
+   b'De',
+   b'dE',
+);
+
+//greek strings in UTF-8
+$greek_lower = base64_decode('zrrOu868zr3Ovs6/z4DPgSDOus67zrzOvc6+zr/PgA==');
+$greek_upper = base64_decode('zprOm86czp3Ons6fzqDOoSDOms6bzpzOnc6ezp/OoA==');
+$greek_mixed = base64_decode('zrrOu868zr3Ovs6fzqDOoSDOus67zpzOnc6+zr/OoA==');
+$greek_haystacks = array($greek_lower, $greek_upper, $greek_mixed);
+
+$greek_nlower = base64_decode('zrzOvc6+zr8=');
+$greek_nupper = base64_decode('zpzOnc6ezp8=');
+$greek_nmixed1 = base64_decode('zpzOnc6+zr8=');
+$greek_nmixed2 = base64_decode('zrzOvc6+zp8=');
+
+$greek_needles = array(
+   // 4 good ones
+   $greek_nlower, $greek_nupper, $greek_nmixed1, $greek_nmixed2,
+);
+
+// try the basic options
+echo "\n -- ASCII Strings --\n";
+foreach ($ascii_needles as $needle) {
+   foreach ($ascii_haystacks as $haystack) {
+      var_dump(mb_stripos($haystack, $needle));      
+      var_dump(mb_stripos($haystack, $needle, 6));
+   }
+}
+
+echo "\n -- Greek Strings --\n";
+foreach ($greek_needles as $needle) {
+   foreach ($greek_haystacks as $haystack) {
+      var_dump(mb_stripos($haystack, $needle));
+      var_dump(mb_stripos($haystack, $needle, 4));         
+   }
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stripos_basic2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_stripos_basic2.php.expectf
new file mode 100644
index 000000000..05905db19
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stripos_basic2.php.expectf
@@ -0,0 +1,54 @@
+*** Testing mb_stripos() : basic functionality***
+
+ -- ASCII Strings --
+int(4)
+int(13)
+int(4)
+int(13)
+int(4)
+int(13)
+int(4)
+int(13)
+int(4)
+int(13)
+int(4)
+int(13)
+int(4)
+int(13)
+int(4)
+int(13)
+int(4)
+int(13)
+int(4)
+int(13)
+int(4)
+int(13)
+int(4)
+int(13)
+
+ -- Greek Strings --
+int(2)
+int(11)
+int(2)
+int(11)
+int(2)
+int(11)
+int(2)
+int(11)
+int(2)
+int(11)
+int(2)
+int(11)
+int(2)
+int(11)
+int(2)
+int(11)
+int(2)
+int(11)
+int(2)
+int(11)
+int(2)
+int(11)
+int(2)
+int(11)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php b/hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php
new file mode 100644
index 000000000..65ab07b0f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php
@@ -0,0 +1,38 @@
+<?php
+/* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Test how mb_stripos() behaves when passed different integers as $offset argument
+ * The character length of $string_ascii and $string_mb is the same, 
+ * and the needle appears at the same positions in both strings
+ */
+
+mb_internal_encoding('UTF-8');
+
+echo "*** Testing mb_stripos() : usage variations ***\n";
+
+$string_ascii = b'+Is an English string'; //21 chars
+$needle_ascii = b'G';
+
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars
+$needle_mb = base64_decode('44CC');
+
+/*
+ * Loop through integers as multiples of ten for $offset argument
+ * mb_stripos should not be able to accept negative values as $offset.
+ * 60 is larger than *BYTE* count for $string_mb
+ */
+for ($i = -10; $i <= 60; $i += 10) {
+	echo "\n**-- Offset is: $i --**\n";
+	echo "-- ASCII String --\n";
+	var_dump(mb_stripos($string_ascii, $needle_ascii, $i));
+	echo "--Multibyte String --\n";
+	var_dump(mb_stripos($string_mb, $needle_mb, $i, 'UTF-8'));
+}
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php.expectf
new file mode 100644
index 000000000..a0aae6796
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php.expectf
@@ -0,0 +1,60 @@
+*** Testing mb_stripos() : usage variations ***
+
+**-- Offset is: -10 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 0 --**
+-- ASCII String --
+int(9)
+--Multibyte String --
+int(9)
+
+**-- Offset is: 10 --**
+-- ASCII String --
+int(20)
+--Multibyte String --
+int(20)
+
+**-- Offset is: 20 --**
+-- ASCII String --
+int(20)
+--Multibyte String --
+int(20)
+
+**-- Offset is: 30 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 40 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 50 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 60 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stristr_basic.php b/hphp/test/zend/good/ext-mbstring/mb_stristr_basic.php
new file mode 100644
index 000000000..a9cbcefd0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stristr_basic.php
@@ -0,0 +1,43 @@
+<?php
+/* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_stristr() : basic functionality ***\n";
+
+mb_internal_encoding('UTF-8');
+
+$string_ascii = b'abcdef';
+$needle_ascii_upper = b"BCD";
+$needle_ascii_mixed = b"bCd";
+$needle_ascii_lower = b"bcd";
+
+//Greek string in lower case UTF-8
+$string_mb = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J');
+$needle_mb_upper = base64_decode('zpzOnc6ezp8=');
+$needle_mb_lower = base64_decode('zrzOvc6+zr8=');
+$needle_mb_mixed = base64_decode('zpzOnc6+zr8=');
+
+echo "\n-- ASCII string: needle exists --\n";
+var_dump(bin2hex(mb_stristr($string_ascii, $needle_ascii_upper, false, 'ISO-8859-1')));
+var_dump(bin2hex(mb_stristr($string_ascii, $needle_ascii_lower)));
+var_dump(bin2hex(mb_stristr($string_ascii, $needle_ascii_mixed, true)));
+
+
+echo "\n-- ASCII string: needle doesn't exist --\n";
+var_dump(mb_stristr($string_ascii, '123'));
+
+echo "\n-- Multibyte string: needle exists --\n";
+var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_upper)));
+var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_lower, false, 'utf-8')));
+var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_mixed, true)));
+
+
+echo "\n-- Multibyte string: needle doesn't exist --\n";
+$needle2 = base64_decode("zrzOvs6/");
+var_dump(mb_stristr($string_mb, $needle2));
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stristr_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_stristr_basic.php.expectf
new file mode 100644
index 000000000..334db8a94
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stristr_basic.php.expectf
@@ -0,0 +1,18 @@
+*** Testing mb_stristr() : basic functionality ***
+
+-- ASCII string: needle exists --
+string(10) "6263646566"
+string(10) "6263646566"
+string(2) "61"
+
+-- ASCII string: needle doesn't exist --
+bool(false)
+
+-- Multibyte string: needle exists --
+string(52) "cebccebdcebecebfcf80cf81cf83cf84cf85cf86cf87cf88cf89"
+string(52) "cebccebdcebecebfcf80cf81cf83cf84cf85cf86cf87cf88cf89"
+string(44) "ceb1ceb2ceb3ceb4ceb5ceb6ceb7ceb8ceb9cebacebb"
+
+-- Multibyte string: needle doesn't exist --
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php b/hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php
new file mode 100644
index 000000000..70f733299
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php
@@ -0,0 +1,19 @@
+<?php
+/* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_stristr() : error conditions ***\n";
+
+
+echo "\n-- Testing mb_stristr() with unknown encoding --\n";
+$haystack = b'Hello, world';
+$needle = b'world';
+$encoding = 'unknown-encoding';
+$part = true;
+var_dump( mb_stristr($haystack, $needle, $part, $encoding) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php.expectf
new file mode 100644
index 000000000..964653560
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php.expectf
@@ -0,0 +1,6 @@
+*** Testing mb_stristr() : error conditions ***
+
+-- Testing mb_stristr() with unknown encoding --
+HipHop Warning: %a
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stristr_variation5.php b/hphp/test/zend/good/ext-mbstring/mb_stristr_variation5.php
new file mode 100644
index 000000000..0e51f5604
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stristr_variation5.php
@@ -0,0 +1,42 @@
+<?php
+/* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_stristr() : basic functionality ***\n";
+
+mb_internal_encoding('UTF-8');
+
+//ascii mixed case, multiple needles
+$string_ascii = b'abcDef zBcDyx';
+$needle_ascii_upper = b"BCD";
+$needle_ascii_mixed = b"bCd";
+$needle_ascii_lower = b"bcd";
+
+//Greek string in mixed case UTF-8 with multiple needles
+$string_mb = base64_decode('zrrOu868zr3Ovs6fzqDOoSDOus67zpzOnc6+zr/OoA==');
+$needle_mb_upper = base64_decode('zpzOnc6ezp8=');
+$needle_mb_lower = base64_decode('zrzOvc6+zr8=');
+$needle_mb_mixed = base64_decode('zpzOnc6+zr8=');
+
+echo "\n-- ASCII string: needle exists --\n";
+var_dump(bin2hex(mb_stristr($string_ascii, $needle_ascii_upper, false)));
+var_dump(bin2hex(mb_stristr($string_ascii, $needle_ascii_upper, true)));
+var_dump(bin2hex(mb_stristr($string_ascii, $needle_ascii_lower, false)));
+var_dump(bin2hex(mb_stristr($string_ascii, $needle_ascii_lower, true)));
+var_dump(bin2hex(mb_stristr($string_ascii, $needle_ascii_mixed, false)));
+var_dump(bin2hex(mb_stristr($string_ascii, $needle_ascii_mixed, true)));
+
+
+echo "\n-- Multibyte string: needle exists --\n";
+var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_upper, false)));
+var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_upper, true)));
+var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_lower, false)));
+var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_lower, true)));
+var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_mixed, false)));
+var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_mixed, true)));
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_stristr_variation5.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_stristr_variation5.php.expectf
new file mode 100644
index 000000000..1e2439eee
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_stristr_variation5.php.expectf
@@ -0,0 +1,18 @@
+*** Testing mb_stristr() : basic functionality ***
+
+-- ASCII string: needle exists --
+string(24) "6263446566207a4263447978"
+string(2) "61"
+string(24) "6263446566207a4263447978"
+string(2) "61"
+string(24) "6263446566207a4263447978"
+string(2) "61"
+
+-- Multibyte string: needle exists --
+string(54) "cebccebdcebece9fcea0cea120cebacebbce9cce9dcebecebfcea0"
+string(8) "cebacebb"
+string(54) "cebccebdcebece9fcea0cea120cebacebbce9cce9dcebecebfcea0"
+string(8) "cebacebb"
+string(54) "cebccebdcebece9fcea0cea120cebacebbce9cce9dcebecebfcea0"
+string(8) "cebacebb"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strlen_basic.php b/hphp/test/zend/good/ext-mbstring/mb_strlen_basic.php
new file mode 100644
index 000000000..bae15078f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strlen_basic.php
@@ -0,0 +1,24 @@
+<?php
+/* Prototype  : int mb_strlen(string $str [, string $encoding])
+ * Description: Get character numbers of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test basic functionality of mb_strlen()
+ */
+
+echo "*** Testing mb_strlen() : basic functionality***\n";
+
+$string_ascii = b'abc def';
+//Japanese string in UTF-8
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+echo "\n-- ASCII String --\n";
+var_dump(mb_strlen($string_ascii));
+
+echo "\n-- Multibyte String --\n";
+var_dump(mb_strlen($string_mb, 'UTF-8'));
+
+echo "\nDone";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strlen_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strlen_basic.php.expectf
new file mode 100644
index 000000000..a4bcb3404
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strlen_basic.php.expectf
@@ -0,0 +1,9 @@
+*** Testing mb_strlen() : basic functionality***
+
+-- ASCII String --
+int(7)
+
+-- Multibyte String --
+int(21)
+
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php b/hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php
new file mode 100644
index 000000000..0387a30dc
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php
@@ -0,0 +1,20 @@
+<?php
+/* Prototype  : int mb_strlen(string $str [, string $encoding])
+ * Description: Get character numbers of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test mb_strlen when passed an unknown encoding
+ */
+
+echo "*** Testing mb_strlen() : error ***\n";
+
+$string = 'abcdef';
+
+$encoding = 'unknown-encoding';
+
+var_dump(mb_strlen($string, $encoding));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php.expectf
new file mode 100644
index 000000000..6af0665af
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_strlen() : error ***
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strlen_variation3.php b/hphp/test/zend/good/ext-mbstring/mb_strlen_variation3.php
new file mode 100644
index 000000000..337d2f7b6
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strlen_variation3.php
@@ -0,0 +1,98 @@
+<?php
+/* Prototype  : int mb_strlen(string $str [, string $encoding])
+ * Description: Get character numbers of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass all encodings listed on php.net to mb_strlen to test that function recognises them
+ * NB: The strings passed are *NOT* necessarily encoded in the encoding passed to the function.
+ * This test is purely to see whether the function recognises the encoding.
+ */
+
+echo "*** Testing mb_strlen() : usage variations ***\n";
+
+$encoding = array('UCS-4',			/*1*/
+                  'UCS-4BE',
+                  'UCS-4LE',
+                  'UCS-2',
+                  'UCS-2BE',		/*5*/
+                  'UCS-2LE',
+                  'UTF-32',
+                  'UTF-32BE',
+                  'UTF-32LE',
+                  'UTF-16',			/*10*/
+                  'UTF-16BE',
+                  'UTF-16LE',
+                  'UTF-7',
+                  'UTF7-IMAP',
+                  'UTF-8',			/*15*/
+                  'ASCII',
+                  'EUC-JP',
+                  'SJIS',
+                  'eucJP-win',
+                  'SJIS-win',		/*20*/
+                  'ISO-2022-JP',
+                  'JIS',
+                  'ISO-8859-1',
+                  'ISO-8859-2',
+                  'ISO-8859-3',		/*25*/
+                  'ISO-8859-4',
+                  'ISO-8859-5',
+                  'ISO-8859-6',
+                  'ISO-8859-7',
+                  'ISO-8859-8',		/*30*/
+                  'ISO-8859-9',
+                  'ISO-8859-10',
+                  'ISO-8859-13',
+                  'ISO-8859-14',
+                  'ISO-8859-15',	/*35*/
+                  'byte2be',
+                  'byte2le',
+                  'byte4be',
+                  'byte4le',
+                  'BASE64',			/*40*/
+                  'HTML-ENTITIES',
+                  '7bit',
+                  '8bit',
+                  'EUC-CN',
+                  'CP936',			/*45*/
+                  'HZ',
+                  'EUC-TW',
+                  'CP950',
+                  'BIG-5',
+                  'EUC-KR',			/*50*/
+                  'UHC',
+                  'ISO-2022-KR',
+                  'Windows-1251',
+                  'Windows-1252',
+                  'CP866',			/*55*/
+                  'KOI8-R');		/*56*/
+
+
+
+$iterator = 1;
+$string_ascii = 'abc def';
+$string_mb = base64_decode('44K/44OT44Ol44Os44O844OG44Kj44Oz44Kw44O744Oe44K344O844Oz44O744Kr44Oz44OR44OL44O8');
+
+foreach($encoding as $enc) {
+	echo "\n-- Iteration $iterator: $enc --\n";
+
+	echo "-- ASCII String --\n";
+	if(mb_strlen($string_ascii, $enc)) {
+		echo "Encoding $enc recognised\n";
+	} else {
+		echo "Encoding $enc not recognised\n";
+	}
+
+	echo "-- Multibyte String --\n";
+	if(mb_strlen($string_mb, $enc)){
+		echo "Encoding $enc recognised\n";
+	} else {
+		echo "Encoding $enc not recognised\n";
+	}
+	$iterator++;
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strlen_variation3.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strlen_variation3.php.expectf
new file mode 100644
index 000000000..ed11022bd
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strlen_variation3.php.expectf
@@ -0,0 +1,338 @@
+*** Testing mb_strlen() : usage variations ***
+
+-- Iteration 1: UCS-4 --
+-- ASCII String --
+Encoding UCS-4 recognised
+-- Multibyte String --
+Encoding UCS-4 recognised
+
+-- Iteration 2: UCS-4BE --
+-- ASCII String --
+Encoding UCS-4BE recognised
+-- Multibyte String --
+Encoding UCS-4BE recognised
+
+-- Iteration 3: UCS-4LE --
+-- ASCII String --
+Encoding UCS-4LE recognised
+-- Multibyte String --
+Encoding UCS-4LE recognised
+
+-- Iteration 4: UCS-2 --
+-- ASCII String --
+Encoding UCS-2 recognised
+-- Multibyte String --
+Encoding UCS-2 recognised
+
+-- Iteration 5: UCS-2BE --
+-- ASCII String --
+Encoding UCS-2BE recognised
+-- Multibyte String --
+Encoding UCS-2BE recognised
+
+-- Iteration 6: UCS-2LE --
+-- ASCII String --
+Encoding UCS-2LE recognised
+-- Multibyte String --
+Encoding UCS-2LE recognised
+
+-- Iteration 7: UTF-32 --
+-- ASCII String --
+Encoding UTF-32 recognised
+-- Multibyte String --
+Encoding UTF-32 recognised
+
+-- Iteration 8: UTF-32BE --
+-- ASCII String --
+Encoding UTF-32BE recognised
+-- Multibyte String --
+Encoding UTF-32BE recognised
+
+-- Iteration 9: UTF-32LE --
+-- ASCII String --
+Encoding UTF-32LE recognised
+-- Multibyte String --
+Encoding UTF-32LE recognised
+
+-- Iteration 10: UTF-16 --
+-- ASCII String --
+Encoding UTF-16 recognised
+-- Multibyte String --
+Encoding UTF-16 recognised
+
+-- Iteration 11: UTF-16BE --
+-- ASCII String --
+Encoding UTF-16BE recognised
+-- Multibyte String --
+Encoding UTF-16BE recognised
+
+-- Iteration 12: UTF-16LE --
+-- ASCII String --
+Encoding UTF-16LE recognised
+-- Multibyte String --
+Encoding UTF-16LE recognised
+
+-- Iteration 13: UTF-7 --
+-- ASCII String --
+Encoding UTF-7 recognised
+-- Multibyte String --
+Encoding UTF-7 recognised
+
+-- Iteration 14: UTF7-IMAP --
+-- ASCII String --
+Encoding UTF7-IMAP recognised
+-- Multibyte String --
+Encoding UTF7-IMAP recognised
+
+-- Iteration 15: UTF-8 --
+-- ASCII String --
+Encoding UTF-8 recognised
+-- Multibyte String --
+Encoding UTF-8 recognised
+
+-- Iteration 16: ASCII --
+-- ASCII String --
+Encoding ASCII recognised
+-- Multibyte String --
+Encoding ASCII recognised
+
+-- Iteration 17: EUC-JP --
+-- ASCII String --
+Encoding EUC-JP recognised
+-- Multibyte String --
+Encoding EUC-JP recognised
+
+-- Iteration 18: SJIS --
+-- ASCII String --
+Encoding SJIS recognised
+-- Multibyte String --
+Encoding SJIS recognised
+
+-- Iteration 19: eucJP-win --
+-- ASCII String --
+Encoding eucJP-win recognised
+-- Multibyte String --
+Encoding eucJP-win recognised
+
+-- Iteration 20: SJIS-win --
+-- ASCII String --
+Encoding SJIS-win recognised
+-- Multibyte String --
+Encoding SJIS-win recognised
+
+-- Iteration 21: ISO-2022-JP --
+-- ASCII String --
+Encoding ISO-2022-JP recognised
+-- Multibyte String --
+Encoding ISO-2022-JP recognised
+
+-- Iteration 22: JIS --
+-- ASCII String --
+Encoding JIS recognised
+-- Multibyte String --
+Encoding JIS recognised
+
+-- Iteration 23: ISO-8859-1 --
+-- ASCII String --
+Encoding ISO-8859-1 recognised
+-- Multibyte String --
+Encoding ISO-8859-1 recognised
+
+-- Iteration 24: ISO-8859-2 --
+-- ASCII String --
+Encoding ISO-8859-2 recognised
+-- Multibyte String --
+Encoding ISO-8859-2 recognised
+
+-- Iteration 25: ISO-8859-3 --
+-- ASCII String --
+Encoding ISO-8859-3 recognised
+-- Multibyte String --
+Encoding ISO-8859-3 recognised
+
+-- Iteration 26: ISO-8859-4 --
+-- ASCII String --
+Encoding ISO-8859-4 recognised
+-- Multibyte String --
+Encoding ISO-8859-4 recognised
+
+-- Iteration 27: ISO-8859-5 --
+-- ASCII String --
+Encoding ISO-8859-5 recognised
+-- Multibyte String --
+Encoding ISO-8859-5 recognised
+
+-- Iteration 28: ISO-8859-6 --
+-- ASCII String --
+Encoding ISO-8859-6 recognised
+-- Multibyte String --
+Encoding ISO-8859-6 recognised
+
+-- Iteration 29: ISO-8859-7 --
+-- ASCII String --
+Encoding ISO-8859-7 recognised
+-- Multibyte String --
+Encoding ISO-8859-7 recognised
+
+-- Iteration 30: ISO-8859-8 --
+-- ASCII String --
+Encoding ISO-8859-8 recognised
+-- Multibyte String --
+Encoding ISO-8859-8 recognised
+
+-- Iteration 31: ISO-8859-9 --
+-- ASCII String --
+Encoding ISO-8859-9 recognised
+-- Multibyte String --
+Encoding ISO-8859-9 recognised
+
+-- Iteration 32: ISO-8859-10 --
+-- ASCII String --
+Encoding ISO-8859-10 recognised
+-- Multibyte String --
+Encoding ISO-8859-10 recognised
+
+-- Iteration 33: ISO-8859-13 --
+-- ASCII String --
+Encoding ISO-8859-13 recognised
+-- Multibyte String --
+Encoding ISO-8859-13 recognised
+
+-- Iteration 34: ISO-8859-14 --
+-- ASCII String --
+Encoding ISO-8859-14 recognised
+-- Multibyte String --
+Encoding ISO-8859-14 recognised
+
+-- Iteration 35: ISO-8859-15 --
+-- ASCII String --
+Encoding ISO-8859-15 recognised
+-- Multibyte String --
+Encoding ISO-8859-15 recognised
+
+-- Iteration 36: byte2be --
+-- ASCII String --
+Encoding byte2be recognised
+-- Multibyte String --
+Encoding byte2be recognised
+
+-- Iteration 37: byte2le --
+-- ASCII String --
+Encoding byte2le recognised
+-- Multibyte String --
+Encoding byte2le recognised
+
+-- Iteration 38: byte4be --
+-- ASCII String --
+Encoding byte4be recognised
+-- Multibyte String --
+Encoding byte4be recognised
+
+-- Iteration 39: byte4le --
+-- ASCII String --
+Encoding byte4le recognised
+-- Multibyte String --
+Encoding byte4le recognised
+
+-- Iteration 40: BASE64 --
+-- ASCII String --
+Encoding BASE64 recognised
+-- Multibyte String --
+Encoding BASE64 recognised
+
+-- Iteration 41: HTML-ENTITIES --
+-- ASCII String --
+Encoding HTML-ENTITIES recognised
+-- Multibyte String --
+Encoding HTML-ENTITIES recognised
+
+-- Iteration 42: 7bit --
+-- ASCII String --
+Encoding 7bit recognised
+-- Multibyte String --
+Encoding 7bit recognised
+
+-- Iteration 43: 8bit --
+-- ASCII String --
+Encoding 8bit recognised
+-- Multibyte String --
+Encoding 8bit recognised
+
+-- Iteration 44: EUC-CN --
+-- ASCII String --
+Encoding EUC-CN recognised
+-- Multibyte String --
+Encoding EUC-CN recognised
+
+-- Iteration 45: CP936 --
+-- ASCII String --
+Encoding CP936 recognised
+-- Multibyte String --
+Encoding CP936 recognised
+
+-- Iteration 46: HZ --
+-- ASCII String --
+Encoding HZ recognised
+-- Multibyte String --
+Encoding HZ recognised
+
+-- Iteration 47: EUC-TW --
+-- ASCII String --
+Encoding EUC-TW recognised
+-- Multibyte String --
+Encoding EUC-TW recognised
+
+-- Iteration 48: CP950 --
+-- ASCII String --
+Encoding CP950 recognised
+-- Multibyte String --
+Encoding CP950 recognised
+
+-- Iteration 49: BIG-5 --
+-- ASCII String --
+Encoding BIG-5 recognised
+-- Multibyte String --
+Encoding BIG-5 recognised
+
+-- Iteration 50: EUC-KR --
+-- ASCII String --
+Encoding EUC-KR recognised
+-- Multibyte String --
+Encoding EUC-KR recognised
+
+-- Iteration 51: UHC --
+-- ASCII String --
+Encoding UHC recognised
+-- Multibyte String --
+Encoding UHC recognised
+
+-- Iteration 52: ISO-2022-KR --
+-- ASCII String --
+Encoding ISO-2022-KR recognised
+-- Multibyte String --
+Encoding ISO-2022-KR recognised
+
+-- Iteration 53: Windows-1251 --
+-- ASCII String --
+Encoding Windows-1251 recognised
+-- Multibyte String --
+Encoding Windows-1251 recognised
+
+-- Iteration 54: Windows-1252 --
+-- ASCII String --
+Encoding Windows-1252 recognised
+-- Multibyte String --
+Encoding Windows-1252 recognised
+
+-- Iteration 55: CP866 --
+-- ASCII String --
+Encoding CP866 recognised
+-- Multibyte String --
+Encoding CP866 recognised
+
+-- Iteration 56: KOI8-R --
+-- ASCII String --
+Encoding KOI8-R recognised
+-- Multibyte String --
+Encoding KOI8-R recognised
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strpos_basic.php b/hphp/test/zend/good/ext-mbstring/mb_strpos_basic.php
new file mode 100644
index 000000000..ed215663c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strpos_basic.php
@@ -0,0 +1,34 @@
+<?php
+/* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test basic functionality of mb_strpos with ASCII and multibyte characters
+ */
+
+echo "*** Testing mb_strpos() : basic functionality***\n";
+
+mb_internal_encoding('UTF-8');
+
+$string_ascii = b'abc def';
+//Japanese string in UTF-8
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+echo "\n-- ASCII string 1 --\n";
+var_dump(mb_strpos($string_ascii, b'd', 2, 'ISO-8859-1'));
+
+echo "\n-- ASCII string 2 --\n";
+var_dump(mb_strpos($string_ascii, '123'));
+
+echo "\n-- Multibyte string 1 --\n";
+$needle1 = base64_decode('5pel5pys6Kqe');
+var_dump(mb_strpos($string_mb, $needle1));
+
+echo "\n-- Multibyte string 2 --\n";
+$needle2 = base64_decode("44GT44KT44Gr44Gh44Gv44CB5LiW55WM");
+var_dump(mb_strpos($string_mb, $needle2));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strpos_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strpos_basic.php.expectf
new file mode 100644
index 000000000..c42ed3146
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strpos_basic.php.expectf
@@ -0,0 +1,14 @@
+*** Testing mb_strpos() : basic functionality***
+
+-- ASCII string 1 --
+int(4)
+
+-- ASCII string 2 --
+bool(false)
+
+-- Multibyte string 1 --
+int(0)
+
+-- Multibyte string 2 --
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php b/hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php
new file mode 100644
index 000000000..cf5afecf2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php
@@ -0,0 +1,20 @@
+<?php
+/* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass an unknown encoding to mb_strpos() to test behaviour
+ */
+
+echo "*** Testing mb_strpos() : error conditions ***\n";
+$haystack = 'Hello, world';
+$needle = 'world';
+$offset = 2;
+$encoding = 'unknown-encoding';
+
+var_dump( mb_strpos($haystack, $needle, $offset, $encoding) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php.expectf
new file mode 100644
index 000000000..180587eb9
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_strpos() : error conditions ***
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php b/hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php
new file mode 100644
index 000000000..6d74dfad5
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php
@@ -0,0 +1,37 @@
+<?php
+/* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test how mb_strpos() behaves when passed different integers as $offset argument
+ * The character length of $string_ascii and $string_mb is the same, 
+ * and the needle appears at the same positions in both strings
+ */
+
+mb_internal_encoding('UTF-8');
+
+echo "*** Testing mb_strpos() : usage variations ***\n";
+
+$string_ascii = b'+Is an English string'; //21 chars
+$needle_ascii = b'g';
+
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars
+$needle_mb = base64_decode('44CC');
+
+/*
+ * Loop through integers as multiples of ten for $offset argument
+ * mb_strpos should not be able to accept negative values as $offset.
+ * 60 is larger than *BYTE* count for $string_mb
+ */
+for ($i = -10; $i <= 60; $i += 10) {
+	echo "\n**-- Offset is: $i --**\n";
+	echo "-- ASCII String --\n";
+	var_dump(mb_strpos($string_ascii, $needle_ascii, $i));
+	echo "--Multibyte String --\n";
+	var_dump(mb_strpos($string_mb, $needle_mb, $i, 'UTF-8'));
+}
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php.expectf
new file mode 100644
index 000000000..d495fd04f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php.expectf
@@ -0,0 +1,60 @@
+*** Testing mb_strpos() : usage variations ***
+
+**-- Offset is: -10 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 0 --**
+-- ASCII String --
+int(9)
+--Multibyte String --
+int(9)
+
+**-- Offset is: 10 --**
+-- ASCII String --
+int(20)
+--Multibyte String --
+int(20)
+
+**-- Offset is: 20 --**
+-- ASCII String --
+int(20)
+--Multibyte String --
+int(20)
+
+**-- Offset is: 30 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 40 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 50 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 60 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrchr_basic.php b/hphp/test/zend/good/ext-mbstring/mb_strrchr_basic.php
new file mode 100644
index 000000000..a0c7326bb
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrchr_basic.php
@@ -0,0 +1,37 @@
+<?php
+/* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrchr() : basic functionality ***\n";
+
+mb_internal_encoding('UTF-8');
+
+$string_ascii = b'abc def';
+//Japanese string in UTF-8
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+echo "\n-- ASCII string: needle exists --\n";
+var_dump(bin2hex(mb_strrchr($string_ascii, b'd', false, 'ISO-8859-1')));
+var_dump(bin2hex(mb_strrchr($string_ascii, b'd')));
+var_dump(bin2hex(mb_strrchr($string_ascii, b'd', true)));
+
+
+echo "\n-- ASCII string: needle doesn't exist --\n";
+var_dump(mb_strrchr($string_ascii, b'123'));
+
+echo "\n-- Multibyte string: needle exists --\n";
+$needle1 = base64_decode('5pel5pys6Kqe');
+var_dump(bin2hex(mb_strrchr($string_mb, $needle1)));
+var_dump(bin2hex(mb_strrchr($string_mb, $needle1, false, 'utf-8')));
+var_dump(bin2hex(mb_strrchr($string_mb, $needle1, true)));
+
+
+echo "\n-- Multibyte string: needle doesn't exist --\n";
+$needle2 = base64_decode('44GT44KT44Gr44Gh44Gv44CB5LiW55WM');
+var_dump(mb_strrchr($string_mb, $needle2));
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrchr_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrchr_basic.php.expectf
new file mode 100644
index 000000000..7a3884382
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrchr_basic.php.expectf
@@ -0,0 +1,18 @@
+*** Testing mb_strrchr() : basic functionality ***
+
+-- ASCII string: needle exists --
+string(6) "646566"
+string(6) "646566"
+string(8) "61626320"
+
+-- ASCII string: needle doesn't exist --
+bool(false)
+
+-- Multibyte string: needle exists --
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+string(0) ""
+
+-- Multibyte string: needle doesn't exist --
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php b/hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php
new file mode 100644
index 000000000..e705f6208
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php
@@ -0,0 +1,19 @@
+<?php
+/* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrchr() : error conditions ***\n";
+
+
+echo "\n-- Testing mb_strrchr() with unknown encoding --\n";
+$haystack = b'Hello, world';
+$needle = b'world';
+$encoding = 'unknown-encoding';
+$part = true;
+var_dump( mb_strrchr($haystack, $needle, $part, $encoding) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php.expectf
new file mode 100644
index 000000000..76001210c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php.expectf
@@ -0,0 +1,6 @@
+*** Testing mb_strrchr() : error conditions ***
+
+-- Testing mb_strrchr() with unknown encoding --
+HipHop Warning: %a
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation5.php b/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation5.php
new file mode 100644
index 000000000..a89756dc3
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation5.php
@@ -0,0 +1,42 @@
+<?php
+/* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrchr() : variation ***\n";
+
+mb_internal_encoding('UTF-8');
+
+//with repeated needles
+$string_ascii = b'abcdef zbcdyx';
+$needle_ascii = b"bcd";
+
+//Japanese string in UTF-8 with repeated needles
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OIMzTvvJXvvJbml6XmnKzoqp7jg4bjgq3jgrnjg4g=');
+$needle_mb = base64_decode('6Kqe44OG44Kt');
+
+echo "-- Ascii data --\n";
+var_dump(bin2hex(mb_strrchr($string_ascii, $needle_ascii, false)));
+var_dump(bin2hex(mb_strrchr($string_ascii, $needle_ascii, true)));
+
+echo "-- mb data in utf-8 --\n";
+$res = mb_strrchr($string_mb, $needle_mb, false);
+if ($res !== false) {
+    var_dump(bin2hex($res));
+}
+else {
+   echo "nothing found!\n";
+}
+$res = mb_strrchr($string_mb, $needle_mb, true);
+if ($res !== false) {
+    var_dump(bin2hex($res));
+}
+else {
+   echo "nothing found!\n";
+}
+
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation5.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation5.php.expectf
new file mode 100644
index 000000000..fe5b579e2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation5.php.expectf
@@ -0,0 +1,8 @@
+*** Testing mb_strrchr() : variation ***
+-- Ascii data --
+string(10) "6263647978"
+string(16) "616263646566207a"
+-- mb data in utf-8 --
+string(30) "e8aa9ee38386e382ade382b9e38388"
+string(70) "e697a5e69cace8aa9ee38386e382ade382b9e383883334efbc95efbc96e697a5e69cac"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation6.php b/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation6.php
new file mode 100644
index 000000000..b1cdf1430
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation6.php
@@ -0,0 +1,46 @@
+<?php
+/* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrchr() : variation ***\n";
+
+mb_internal_encoding('UTF-8');
+
+//ascii
+$string_ascii = b'abcdef';
+$needle_ascii_upper = b"BCD";
+$needle_ascii_mixed = b"bCd";
+$needle_ascii_lower = b"bcd";
+
+//Greek string in lower case UTF-8
+$string_mb = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J');
+$needle_mb_upper = base64_decode('zpzOnc6ezp8=');
+$needle_mb_lower = base64_decode('zrzOvc6+zr8=');
+$needle_mb_mixed = base64_decode('zpzOnc6+zr8=');
+
+echo "-- Ascii data --\n";
+// needle should be found
+var_dump(bin2hex(mb_strrchr($string_ascii, $needle_ascii_lower)));
+// no needle should be found
+var_dump(mb_strrchr($string_ascii, $needle_ascii_upper));
+var_dump(mb_strrchr($string_ascii, $needle_ascii_mixed));
+
+echo "-- mb data in utf-8 --\n";
+// needle should be found
+$res = mb_strrchr($string_mb, $needle_mb_lower, false);
+if ($res !== false) {
+    var_dump(bin2hex($res));
+}
+else {
+   echo "nothing found!\n";
+}
+// no needle should be found
+var_dump(mb_strrchr($string_mb, $needle_mb_upper));
+var_dump(mb_strrchr($string_mb, $needle_mb_mixed));
+
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation6.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation6.php.expectf
new file mode 100644
index 000000000..f0b014c4f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrchr_variation6.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strrchr() : variation ***
+-- Ascii data --
+string(10) "6263646566"
+bool(false)
+bool(false)
+-- mb data in utf-8 --
+string(52) "cebccebdcebecebfcf80cf81cf83cf84cf85cf86cf87cf88cf89"
+bool(false)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrichr_basic.php b/hphp/test/zend/good/ext-mbstring/mb_strrichr_basic.php
new file mode 100644
index 000000000..6af89e7a5
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrichr_basic.php
@@ -0,0 +1,43 @@
+<?php
+/* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrichr() : basic functionality ***\n";
+
+mb_internal_encoding('UTF-8');
+
+$string_ascii = b'abcdef';
+$needle_ascii_upper = b"BCD";
+$needle_ascii_mixed = b"bCd";
+$needle_ascii_lower = b"bcd";
+
+//Greek string in lower case UTF-8
+$string_mb = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J');
+$needle_mb_upper = base64_decode('zpzOnc6ezp8=');
+$needle_mb_lower = base64_decode('zrzOvc6+zr8=');
+$needle_mb_mixed = base64_decode('zpzOnc6+zr8=');
+
+echo "\n-- ASCII string: needle exists --\n";
+var_dump(bin2hex(mb_strrichr($string_ascii, $needle_ascii_upper, false, 'ISO-8859-1')));
+var_dump(bin2hex(mb_strrichr($string_ascii, $needle_ascii_lower)));
+var_dump(bin2hex(mb_strrichr($string_ascii, $needle_ascii_mixed, true)));
+
+
+echo "\n-- ASCII string: needle doesn't exist --\n";
+var_dump(mb_strrichr($string_ascii, b'123'));
+
+echo "\n-- Multibyte string: needle exists --\n";
+var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_upper)));
+var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_lower, false, 'utf-8')));
+var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_mixed, true)));
+
+
+echo "\n-- Multibyte string: needle doesn't exist --\n";
+$needle2 = base64_decode('zrzOvs6/');
+var_dump(mb_strrichr($string_mb, $needle2));
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrichr_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrichr_basic.php.expectf
new file mode 100644
index 000000000..d3b0223c6
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrichr_basic.php.expectf
@@ -0,0 +1,18 @@
+*** Testing mb_strrichr() : basic functionality ***
+
+-- ASCII string: needle exists --
+string(10) "6263646566"
+string(10) "6263646566"
+string(2) "61"
+
+-- ASCII string: needle doesn't exist --
+bool(false)
+
+-- Multibyte string: needle exists --
+string(52) "cebccebdcebecebfcf80cf81cf83cf84cf85cf86cf87cf88cf89"
+string(52) "cebccebdcebecebfcf80cf81cf83cf84cf85cf86cf87cf88cf89"
+string(44) "ceb1ceb2ceb3ceb4ceb5ceb6ceb7ceb8ceb9cebacebb"
+
+-- Multibyte string: needle doesn't exist --
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php b/hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php
new file mode 100644
index 000000000..a6d2acd02
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php
@@ -0,0 +1,19 @@
+<?php
+/* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrichr() : error conditions ***\n";
+
+
+echo "\n-- Testing mb_strrichr() with unknown encoding --\n";
+$haystack = b'Hello, world';
+$needle = b'world';
+$encoding = 'unknown-encoding';
+$part = true;
+var_dump( mb_strrichr($haystack, $needle, $part, $encoding) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php.expectf
new file mode 100644
index 000000000..59be17279
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php.expectf
@@ -0,0 +1,6 @@
+*** Testing mb_strrichr() : error conditions ***
+
+-- Testing mb_strrichr() with unknown encoding --
+HipHop Warning: %a
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrichr_variation5.php b/hphp/test/zend/good/ext-mbstring/mb_strrichr_variation5.php
new file mode 100644
index 000000000..8e9fcf07e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrichr_variation5.php
@@ -0,0 +1,42 @@
+<?php
+/* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strrichr() : basic functionality ***\n";
+
+mb_internal_encoding('UTF-8');
+
+//ascii mixed case, multiple needles
+$string_ascii = b'abcDef zBcDyx';
+$needle_ascii_upper = b"BCD";
+$needle_ascii_mixed = b"bCd";
+$needle_ascii_lower = b"bcd";
+
+//Greek string in mixed case UTF-8 with multiple needles
+$string_mb = base64_decode('zrrOu868zr3Ovs6fzqDOoSDOus67zpzOnc6+zr/OoA==');
+$needle_mb_upper = base64_decode('zpzOnc6ezp8=');
+$needle_mb_lower = base64_decode('zrzOvc6+zr8=');
+$needle_mb_mixed = base64_decode('zpzOnc6+zr8=');
+
+echo "\n-- ASCII string: needle exists --\n";
+var_dump(bin2hex(mb_strrichr($string_ascii, $needle_ascii_upper, false)));
+var_dump(bin2hex(mb_strrichr($string_ascii, $needle_ascii_upper, true)));
+var_dump(bin2hex(mb_strrichr($string_ascii, $needle_ascii_lower, false)));
+var_dump(bin2hex(mb_strrichr($string_ascii, $needle_ascii_lower, true)));
+var_dump(bin2hex(mb_strrichr($string_ascii, $needle_ascii_mixed, false)));
+var_dump(bin2hex(mb_strrichr($string_ascii, $needle_ascii_mixed, true)));
+
+
+echo "\n-- Multibyte string: needle exists --\n";
+var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_upper, false)));
+var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_upper, true)));
+var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_lower, false)));
+var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_lower, true)));
+var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_mixed, false)));
+var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_mixed, true)));
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrichr_variation5.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrichr_variation5.php.expectf
new file mode 100644
index 000000000..f5fc26417
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrichr_variation5.php.expectf
@@ -0,0 +1,18 @@
+*** Testing mb_strrichr() : basic functionality ***
+
+-- ASCII string: needle exists --
+string(10) "4263447978"
+string(16) "616263446566207a"
+string(10) "4263447978"
+string(16) "616263446566207a"
+string(10) "4263447978"
+string(16) "616263446566207a"
+
+-- Multibyte string: needle exists --
+string(20) "ce9cce9dcebecebfcea0"
+string(42) "cebacebbcebccebdcebece9fcea0cea120cebacebb"
+string(20) "ce9cce9dcebecebfcea0"
+string(42) "cebacebbcebccebdcebece9fcea0cea120cebacebb"
+string(20) "ce9cce9dcebecebfcea0"
+string(42) "cebacebbcebccebdcebece9fcea0cea120cebacebb"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strripos_basic.php b/hphp/test/zend/good/ext-mbstring/mb_strripos_basic.php
new file mode 100644
index 000000000..2424b7b86
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strripos_basic.php
@@ -0,0 +1,91 @@
+<?php
+/* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Test basic functionality of mb_strripos with ASCII and multibyte characters
+ */
+
+echo "*** Testing mb_strripos() : basic functionality***\n";
+
+mb_internal_encoding('UTF-8');
+
+//ascii strings
+$ascii_haystacks = array(
+   b'abc defabc   def',
+   b'ABC DEFABC   DEF',
+   b'Abc dEFaBC   Def',
+);
+
+$ascii_needles = array(
+   // 4 good ones
+   b'DE',
+   b'de',
+   b'De',
+   b'dE',
+   
+   //flag a swap between good and bad
+   '!', 
+   
+   // 4 bad ones
+   b'df',
+   b'Df',
+   b'dF', 
+   b'DF'
+);
+
+//greek strings in UTF-8
+$greek_lower = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J');
+$greek_upper = base64_decode('zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p');
+$greek_mixed = base64_decode('zrHOss6TzpTOlc6WzpfOmM65zrrOu868zr3Ovs6fzqDOoc6jzqTOpc+Gz4fPiM+J');
+$greek_haystacks = array($greek_lower, $greek_upper, $greek_mixed);
+
+$greek_nlower = base64_decode('zrzOvc6+zr8=');
+$greek_nupper = base64_decode('zpzOnc6ezp8=');
+$greek_nmixed1 = base64_decode('zpzOnc6+zr8=');
+$greek_nmixed2 = base64_decode('zrzOvc6+zp8=');
+
+$greek_blower = base64_decode('zpzOns6f');
+$greek_bupper = base64_decode('zrzOvs6/');
+$greek_bmixed1 = base64_decode('zpzOvs6/');
+$greek_bmixed2 = base64_decode('zrzOvs6f');
+$greek_needles = array(
+   // 4 good ones
+   $greek_nlower, $greek_nupper, $greek_nmixed1, $greek_nmixed2,
+   
+   '!', // used to flag a swap between good and bad
+   
+   // 4 bad ones
+   $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2,   
+);
+
+// try the basic options
+echo "\n -- ASCII Strings, needle should be found --\n";
+foreach ($ascii_needles as $needle) {
+   if ($needle == '!') {
+      echo "\n -- ASCII Strings, needle should not be found --\n";
+   }
+   else {
+      foreach ($ascii_haystacks as $haystack) {
+         var_dump(mb_strripos($haystack, $needle));
+      }
+   }   
+}
+
+echo "\n -- Greek Strings, needle should be found --\n";
+foreach ($greek_needles as $needle) {
+   if ($needle == '!') {
+      echo "\n -- ASCII Strings, needle should not be found --\n";
+   }
+   else {
+      foreach ($greek_haystacks as $haystack) {
+         var_dump(mb_strripos($haystack, $needle));
+      }
+   }   
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strripos_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strripos_basic.php.expectf
new file mode 100644
index 000000000..2dfe36fc0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strripos_basic.php.expectf
@@ -0,0 +1,58 @@
+*** Testing mb_strripos() : basic functionality***
+
+ -- ASCII Strings, needle should be found --
+int(13)
+int(13)
+int(13)
+int(13)
+int(13)
+int(13)
+int(13)
+int(13)
+int(13)
+int(13)
+int(13)
+int(13)
+
+ -- ASCII Strings, needle should not be found --
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+
+ -- Greek Strings, needle should be found --
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+int(11)
+
+ -- ASCII Strings, needle should not be found --
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strripos_basic2.php b/hphp/test/zend/good/ext-mbstring/mb_strripos_basic2.php
new file mode 100644
index 000000000..877737f8a
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strripos_basic2.php
@@ -0,0 +1,65 @@
+<?php
+/* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Test basic functionality of mb_strripos with ASCII and multibyte characters
+ */
+
+echo "*** Testing mb_strripos() : basic functionality***\n";
+
+mb_internal_encoding('UTF-8');
+
+//ascii strings
+$ascii_haystacks = array(
+   b'abc defabc   def',
+   b'ABC DEFABC   DEF',
+   b'Abc dEFaBC   Def',
+);
+
+$ascii_needles = array(
+   // 4 good ones
+   b'DE',
+   b'de',
+   b'De',
+   b'dE',
+);
+
+//greek strings in UTF-8
+$greek_lower = base64_decode('zrrOu868zr3Ovs6/z4DPgSDOus67zrzOvc6+zr/PgA==');
+$greek_upper = base64_decode('zprOm86czp3Ons6fzqDOoSDOms6bzpzOnc6ezp/OoA==');
+$greek_mixed = base64_decode('zrrOu868zr3Ovs6fzqDOoSDOus67zpzOnc6+zr/OoA==');
+$greek_haystacks = array($greek_lower, $greek_upper, $greek_mixed);
+
+$greek_nlower = base64_decode('zrzOvc6+zr8=');
+$greek_nupper = base64_decode('zpzOnc6ezp8=');
+$greek_nmixed1 = base64_decode('zpzOnc6+zr8=');
+$greek_nmixed2 = base64_decode('zrzOvc6+zp8=');
+
+$greek_needles = array(
+   // 4 good ones
+   $greek_nlower, $greek_nupper, $greek_nmixed1, $greek_nmixed2,
+);
+
+// try the basic options
+echo "\n -- ASCII Strings --\n";
+foreach ($ascii_needles as $needle) {
+   foreach ($ascii_haystacks as $haystack) {
+      var_dump(mb_strripos($haystack, $needle));      
+      var_dump(mb_strripos($haystack, $needle, 14));
+   }
+}
+
+echo "\n -- Greek Strings --\n";
+foreach ($greek_needles as $needle) {
+   foreach ($greek_haystacks as $haystack) {
+      var_dump(mb_strripos($haystack, $needle));
+      var_dump(mb_strripos($haystack, $needle, 12));         
+   }
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strripos_basic2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strripos_basic2.php.expectf
new file mode 100644
index 000000000..81a16cfaa
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strripos_basic2.php.expectf
@@ -0,0 +1,54 @@
+*** Testing mb_strripos() : basic functionality***
+
+ -- ASCII Strings --
+int(13)
+bool(false)
+int(13)
+bool(false)
+int(13)
+bool(false)
+int(13)
+bool(false)
+int(13)
+bool(false)
+int(13)
+bool(false)
+int(13)
+bool(false)
+int(13)
+bool(false)
+int(13)
+bool(false)
+int(13)
+bool(false)
+int(13)
+bool(false)
+int(13)
+bool(false)
+
+ -- Greek Strings --
+int(11)
+bool(false)
+int(11)
+bool(false)
+int(11)
+bool(false)
+int(11)
+bool(false)
+int(11)
+bool(false)
+int(11)
+bool(false)
+int(11)
+bool(false)
+int(11)
+bool(false)
+int(11)
+bool(false)
+int(11)
+bool(false)
+int(11)
+bool(false)
+int(11)
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php b/hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php
new file mode 100644
index 000000000..b9e1b34b0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php
@@ -0,0 +1,38 @@
+<?php
+/* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
+ * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+/*
+ * Test how mb_strripos() behaves when passed different integers as $offset argument
+ * The character length of $string_ascii and $string_mb is the same, 
+ * and the needle appears at the same positions in both strings
+ */
+
+mb_internal_encoding('UTF-8');
+
+echo "*** Testing mb_strripos() : usage variations ***\n";
+
+$string_ascii = b'+Is an English string'; //21 chars
+$needle_ascii = b'G';
+
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars
+$needle_mb = base64_decode('44CC');
+
+/*
+ * Loop through integers as multiples of ten for $offset argument
+ * mb_strripos should not be able to accept negative values as $offset.
+ * 60 is larger than *BYTE* count for $string_mb
+ */
+for ($i = -10; $i <= 60; $i += 10) {
+	echo "\n**-- Offset is: $i --**\n";
+	echo "-- ASCII String --\n";
+	var_dump(mb_strripos($string_ascii, $needle_ascii, $i));
+	echo "--Multibyte String --\n";
+	var_dump(mb_strripos($string_mb, $needle_mb, $i, 'UTF-8'));
+}
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php.expectf
new file mode 100644
index 000000000..7dfaa2c71
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php.expectf
@@ -0,0 +1,58 @@
+*** Testing mb_strripos() : usage variations ***
+
+**-- Offset is: -10 --**
+-- ASCII String --
+int(9)
+--Multibyte String --
+int(9)
+
+**-- Offset is: 0 --**
+-- ASCII String --
+int(20)
+--Multibyte String --
+int(20)
+
+**-- Offset is: 10 --**
+-- ASCII String --
+int(20)
+--Multibyte String --
+int(20)
+
+**-- Offset is: 20 --**
+-- ASCII String --
+int(20)
+--Multibyte String --
+int(20)
+
+**-- Offset is: 30 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 40 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 50 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+
+**-- Offset is: 60 --**
+-- ASCII String --
+HipHop Warning: %a
+bool(false)
+--Multibyte String --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrpos_basic.php b/hphp/test/zend/good/ext-mbstring/mb_strrpos_basic.php
new file mode 100644
index 000000000..02c4399ff
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrpos_basic.php
@@ -0,0 +1,34 @@
+<?php
+/* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of last occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test basic functionality of mb_strrpos()
+ */
+
+echo "*** Testing mb_strrpos() : basic ***\n";
+
+mb_internal_encoding('UTF-8');
+
+$string_ascii = b'This is an English string. 0123456789.';
+//Japanese string in UTF-8
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+echo "\n-- ASCII string 1 --\n";
+var_dump(mb_strrpos($string_ascii, b'is', 4, 'ISO-8859-1'));
+
+echo "\n-- ASCII string 2 --\n";
+var_dump(mb_strrpos($string_ascii, b'hello, world'));
+
+echo "\n-- Multibyte string 1 --\n";
+$needle1 = base64_decode('44CC');
+var_dump(mb_strrpos($string_mb, $needle1));
+
+echo "\n-- Multibyte string 2 --\n";
+$needle2 = base64_decode('44GT44KT44Gr44Gh44Gv44CB5LiW55WM');
+var_dump(mb_strrpos($string_mb, $needle2));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrpos_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrpos_basic.php.expectf
new file mode 100644
index 000000000..fcb995aaf
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrpos_basic.php.expectf
@@ -0,0 +1,14 @@
+*** Testing mb_strrpos() : basic ***
+
+-- ASCII string 1 --
+int(15)
+
+-- ASCII string 2 --
+bool(false)
+
+-- Multibyte string 1 --
+int(20)
+
+-- Multibyte string 2 --
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrpos_variation5.php b/hphp/test/zend/good/ext-mbstring/mb_strrpos_variation5.php
new file mode 100644
index 000000000..e5e490936
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrpos_variation5.php
@@ -0,0 +1,32 @@
+<?php
+/* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
+ * Description: Find position of last occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Testing deprecated behaviour where third argument can be $encoding
+ */
+
+echo "*** Testing mb_strrpos() : usage variations ***\n";
+
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+$needle_mb = base64_decode('44CC');
+
+$stringh = <<<END
+utf-8
+END;
+
+$inputs = array('Double Quoted String' => "utf-8",
+                'Single Quoted String' => 'utf-8',
+                'Heredoc' => $stringh);
+foreach ($inputs as $type => $input) {
+	echo "\n-- $type --\n";
+	echo "-- With fourth encoding argument --\n";
+	var_dump(mb_strrpos($string_mb, $needle_mb, $input, 'utf-8'));
+	echo "-- Without fourth encoding argument --\n";
+	var_dump(mb_strrpos($string_mb, $needle_mb, $input));
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrpos_variation5.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrpos_variation5.php.expectf
new file mode 100644
index 000000000..d7314c513
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strrpos_variation5.php.expectf
@@ -0,0 +1,20 @@
+*** Testing mb_strrpos() : usage variations ***
+
+-- Double Quoted String --
+-- With fourth encoding argument --
+int(20)
+-- Without fourth encoding argument --
+int(20)
+
+-- Single Quoted String --
+-- With fourth encoding argument --
+int(20)
+-- Without fourth encoding argument --
+int(20)
+
+-- Heredoc --
+-- With fourth encoding argument --
+int(20)
+-- Without fourth encoding argument --
+int(20)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strstr_basic.php b/hphp/test/zend/good/ext-mbstring/mb_strstr_basic.php
new file mode 100644
index 000000000..4fff243bc
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strstr_basic.php
@@ -0,0 +1,37 @@
+<?php
+/* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strstr() : basic functionality ***\n";
+
+mb_internal_encoding('UTF-8');
+
+$string_ascii = b'abc def';
+//Japanese string in UTF-8
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+echo "\n-- ASCII string: needle exists --\n";
+var_dump(bin2hex(mb_strstr($string_ascii, b'd', false, 'ISO-8859-1')));
+var_dump(bin2hex(mb_strstr($string_ascii, b'd')));
+var_dump(bin2hex(mb_strstr($string_ascii, b'd', true)));
+
+
+echo "\n-- ASCII string: needle doesn't exist --\n";
+var_dump(mb_strstr($string_ascii, b'123'));
+
+echo "\n-- Multibyte string: needle exists --\n";
+$needle1 = base64_decode('5pel5pys6Kqe');
+var_dump(bin2hex(mb_strstr($string_mb, $needle1)));
+var_dump(bin2hex(mb_strstr($string_mb, $needle1, false, 'utf-8')));
+var_dump(bin2hex(mb_strstr($string_mb, $needle1, true)));
+
+
+echo "\n-- Multibyte string: needle doesn't exist --\n";
+$needle2 = base64_decode('44GT44KT44Gr44Gh44Gv44CB5LiW55WM');
+var_dump(mb_strstr($string_mb, $needle2));
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strstr_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strstr_basic.php.expectf
new file mode 100644
index 000000000..d9aa13818
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strstr_basic.php.expectf
@@ -0,0 +1,18 @@
+*** Testing mb_strstr() : basic functionality ***
+
+-- ASCII string: needle exists --
+string(6) "646566"
+string(6) "646566"
+string(8) "61626320"
+
+-- ASCII string: needle doesn't exist --
+bool(false)
+
+-- Multibyte string: needle exists --
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+string(0) ""
+
+-- Multibyte string: needle doesn't exist --
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php b/hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php
new file mode 100644
index 000000000..e2e8fdff8
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php
@@ -0,0 +1,19 @@
+<?php
+/* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strstr() : error conditions ***\n";
+
+
+echo "\n-- Testing mb_strstr() with unknown encoding --\n";
+$haystack = b'Hello, world';
+$needle = b'world';
+$encoding = 'unknown-encoding';
+$part = true;
+var_dump( mb_strstr($haystack, $needle, $part, $encoding) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php.expectf
new file mode 100644
index 000000000..26014aec8
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php.expectf
@@ -0,0 +1,6 @@
+*** Testing mb_strstr() : error conditions ***
+
+-- Testing mb_strstr() with unknown encoding --
+HipHop Warning: %a
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strstr_variation5.php b/hphp/test/zend/good/ext-mbstring/mb_strstr_variation5.php
new file mode 100644
index 000000000..f747edc07
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strstr_variation5.php
@@ -0,0 +1,42 @@
+<?php
+/* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strstr() : variation ***\n";
+
+mb_internal_encoding('UTF-8');
+
+//with repeated needles
+$string_ascii = b'abcdef zbcdyx';
+$needle_ascii = b"bcd";
+
+//Japanese string in UTF-8 with repeated needles
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OIMzTvvJXvvJbml6XmnKzoqp7jg4bjgq3jgrnjg4g=');
+$needle_mb = base64_decode('6Kqe44OG44Kt');
+
+echo "-- Ascii data --\n";
+var_dump(bin2hex(mb_strstr($string_ascii, $needle_ascii, false)));
+var_dump(bin2hex(mb_strstr($string_ascii, $needle_ascii, true)));
+
+echo "-- mb data in utf-8 --\n";
+$res = mb_strstr($string_mb, $needle_mb, false);
+if ($res !== false) {
+    var_dump(bin2hex($res));
+}
+else {
+   echo "nothing found!\n";
+}
+$res = mb_strstr($string_mb, $needle_mb, true);
+if ($res !== false) {
+    var_dump(bin2hex($res));
+}
+else {
+   echo "nothing found!\n";
+}
+
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strstr_variation5.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strstr_variation5.php.expectf
new file mode 100644
index 000000000..c75a28b13
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strstr_variation5.php.expectf
@@ -0,0 +1,8 @@
+*** Testing mb_strstr() : variation ***
+-- Ascii data --
+string(24) "6263646566207a6263647978"
+string(2) "61"
+-- mb data in utf-8 --
+string(88) "e8aa9ee38386e382ade382b9e383883334efbc95efbc96e697a5e69cace8aa9ee38386e382ade382b9e38388"
+string(12) "e697a5e69cac"
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strstr_variation6.php b/hphp/test/zend/good/ext-mbstring/mb_strstr_variation6.php
new file mode 100644
index 000000000..05586a63c
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strstr_variation6.php
@@ -0,0 +1,46 @@
+<?php
+/* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
+ * Description: Finds first occurrence of a string within another 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_strstr() : variation ***\n";
+
+mb_internal_encoding('UTF-8');
+
+//ascii
+$string_ascii = b'abcdef';
+$needle_ascii_upper = b"BCD";
+$needle_ascii_mixed = b"bCd";
+$needle_ascii_lower = b"bcd";
+
+//Greek string in lower case UTF-8
+$string_mb = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J');
+$needle_mb_upper = base64_decode('zpzOnc6ezp8=');
+$needle_mb_lower = base64_decode('zrzOvc6+zr8=');
+$needle_mb_mixed = base64_decode('zpzOnc6+zr8=');
+
+echo "-- Ascii data --\n";
+// needle should be found
+var_dump(bin2hex(mb_strstr($string_ascii, $needle_ascii_lower)));
+// no needle should be found
+var_dump(mb_strstr($string_ascii, $needle_ascii_upper));
+var_dump(mb_strstr($string_ascii, $needle_ascii_mixed));
+
+echo "-- mb data in utf-8 --\n";
+// needle should be found
+$res = mb_strstr($string_mb, $needle_mb_lower, false);
+if ($res !== false) {
+    var_dump(bin2hex($res));
+}
+else {
+   echo "nothing found!\n";
+}
+// no needle should be found
+var_dump(mb_strstr($string_mb, $needle_mb_upper));
+var_dump(mb_strstr($string_mb, $needle_mb_mixed));
+
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strstr_variation6.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strstr_variation6.php.expectf
new file mode 100644
index 000000000..cc6407cbd
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strstr_variation6.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strstr() : variation ***
+-- Ascii data --
+string(10) "6263646566"
+bool(false)
+bool(false)
+-- mb data in utf-8 --
+string(52) "cebccebdcebecebfcf80cf81cf83cf84cf85cf86cf87cf88cf89"
+bool(false)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtolower_basic.php b/hphp/test/zend/good/ext-mbstring/mb_strtolower_basic.php
new file mode 100644
index 000000000..344abcb94
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtolower_basic.php
@@ -0,0 +1,39 @@
+<?php
+/* Prototype  : string mb_strtolower(string $sourcestring [, string $encoding])
+ * Description: Returns a lowercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test basic functionality of mb_strtolower
+ */
+
+echo "*** Testing mb_strtolower() : basic functionality***\n";
+
+$ascii_lower = 'abcdefghijklmnopqrstuvwxyz';
+$ascii_upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+$greek_lower = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J');
+$greek_upper = base64_decode('zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p');
+
+echo "\n-- ASCII String --\n";
+$ascii = mb_strtolower($ascii_upper);
+var_dump($ascii);
+
+if($ascii == $ascii_lower) {
+	echo "Correctly converted\n";
+} else {
+	echo "Incorrectly converted\n";
+}
+
+echo "\n-- Multibyte String --\n";
+$mb = mb_strtolower($greek_upper, 'UTF-8');
+var_dump(base64_encode($mb));
+
+if ($mb == $greek_lower) {
+	echo "Correctly converted\n";
+} else {
+	echo "Incorreclty converted\n";
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtolower_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strtolower_basic.php.expectf
new file mode 100644
index 000000000..898d4b5c0
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtolower_basic.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strtolower() : basic functionality***
+
+-- ASCII String --
+string(26) "abcdefghijklmnopqrstuvwxyz"
+Correctly converted
+
+-- Multibyte String --
+string(64) "zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J"
+Correctly converted
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php b/hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php
new file mode 100644
index 000000000..e9c04816f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php
@@ -0,0 +1,25 @@
+<?php
+/* Prototype  : string mb_strtolower(string $sourcestring [, string $encoding])
+ * Description: Returns a lowercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass an incorrect number of arguments to mb_strtolower() to test behaviour
+ */
+
+echo "*** Testing mb_strtolower() : error conditions***\n";
+
+//Test mb_strtolower with one more than the expected number of arguments
+echo "\n-- Testing mb_strtolower() function with more than expected no. of arguments --\n";
+$sourcestring = 'string_value';
+$encoding = 'UTF-8';
+$extra_arg = 10;
+var_dump( mb_strtolower($sourcestring, $encoding, $extra_arg) );
+
+//Test mb_strtolower with zero arguments
+echo "\n-- Testing mb_strtolower() function with zero arguments --\n";
+var_dump( mb_strtolower() );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php.expectf
new file mode 100644
index 000000000..ae2284797
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strtolower() : error conditions***
+
+-- Testing mb_strtolower() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+
+-- Testing mb_strtolower() function with zero arguments --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation3.php b/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation3.php
new file mode 100644
index 000000000..47624f001
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation3.php
@@ -0,0 +1,37 @@
+<?php
+/* Prototype  : string mb_strtolower(string $sourcestring [, string $encoding])
+ * Description: Returns a lowercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass a Japanese string and a mixed Japanese and ASCII string to mb_strtolower
+ * to check correct conversion is occuring (Japanese characters should not be converted).
+ */
+
+echo "*** Testing mb_strtolower() : usage variations ***\n";
+
+$string_mixed = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCUEhQLiAwMTIzNO+8le+8lu+8l++8mO+8meOAgg==');
+$string_mixed_lower = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCcGhwLiAwMTIzNO+8le+8lu+8l++8mO+8meOAgg==');
+$string_all_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC');
+
+echo "\n-- Mixed string (mulitbyte and ASCII characters) --\n";
+$a = mb_strtolower($string_mixed, 'UTF-8');
+var_dump(base64_encode($a));
+if ($a == $string_mixed_lower) {
+	echo "Correctly Converted\n";
+} else {
+	echo "Incorrectly Converted\n";
+}
+
+echo "\n-- Multibyte Only String--\n";
+$b = mb_strtolower($string_all_mb, 'UTF-8');
+var_dump(base64_encode($b));
+if ($b == $string_all_mb) { // Japanese characters only - should not be any conversion
+	echo "Correctly Converted\n";
+} else {
+	echo "Incorrectly Converted\n";
+}
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation3.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation3.php.expectf
new file mode 100644
index 000000000..df5064cf6
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation3.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strtolower() : usage variations ***
+
+-- Mixed string (mulitbyte and ASCII characters) --
+string(80) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCcGhwLiAwMTIzNO+8le+8lu+8l++8mO+8meOAgg=="
+Correctly Converted
+
+-- Multibyte Only String--
+string(40) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC"
+Correctly Converted
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation4.php b/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation4.php
new file mode 100644
index 000000000..e631749a2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation4.php
@@ -0,0 +1,32 @@
+<?php
+/* Prototype  : string mb_strtolower(string $sourcestring [, string $encoding])
+ * Description: Returns a lowercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass accented characters and Russian characters to check case conversion is correct
+ */
+
+echo "*** Testing mb_strtolower() :  usage variations ***\n";
+
+$uppers = array('Basic Latin' => b'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 
+                'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='),
+                'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw=='));
+$lowers = array('Basic Latin' => b'abcdefghijklmnopqrstuvwxyz',
+                'Characters With Accents' => base64_decode('w6DDocOiw6PDpMOlw6bDp8Oow6nDqsOrw6zDrcOuw6/DsMOxw7LDs8O0w7XDtg=='),
+                'Russian' => base64_decode('0LDQsdCy0LPQtNC10LbQtw=='));
+
+foreach ($uppers as $lang => $sourcestring) {
+	echo "\n-- $lang --\n";
+	$a = mb_strtolower($sourcestring, 'utf-8');
+	var_dump(base64_encode($a));
+	if ($a == $lowers[$lang]) {
+		echo "Correctly Converted\n";
+	} else {
+		echo "Incorrectly Converted\n";
+	}
+}
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation4.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation4.php.expectf
new file mode 100644
index 000000000..09f99fff9
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtolower_variation4.php.expectf
@@ -0,0 +1,14 @@
+*** Testing mb_strtolower() :  usage variations ***
+
+-- Basic Latin --
+string(36) "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXo="
+Correctly Converted
+
+-- Characters With Accents --
+string(64) "w6DDocOiw6PDpMOlw6bDp8Oow6nDqsOrw6zDrcOuw6/DsMOxw7LDs8O0w7XDtg=="
+Correctly Converted
+
+-- Russian --
+string(24) "0LDQsdCy0LPQtNC10LbQtw=="
+Correctly Converted
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtoupper_basic.php b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_basic.php
new file mode 100644
index 000000000..9ae636eed
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_basic.php
@@ -0,0 +1,40 @@
+<?php
+/* Prototype  : string mb_strtoupper(string $sourcestring [, string $encoding]
+ * Description: Returns a uppercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test basic functionality of mb_strtoupper
+ */
+
+echo "*** Testing mb_strtoupper() : basic functionality ***\n";
+
+mb_internal_encoding('utf-8');
+$ascii_lower = b'abcdefghijklmnopqrstuvwxyz';
+$ascii_upper = b'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+$greek_lower = base64_decode('zrHOss6zzrTOtc62zrfOuM65zrrOu868zr3Ovs6/z4DPgc+Dz4TPhc+Gz4fPiM+J');
+$greek_upper = base64_decode('zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p');
+
+echo "\n-- ASCII String --\n";
+$ascii = mb_strtoupper($ascii_lower);
+var_dump(base64_encode($ascii));
+
+if($ascii == $ascii_upper) {
+	echo "Correctly converted\n";
+} else {
+	echo "Incorrectly converted\n";
+}
+
+echo "\n-- Multibyte String --\n";
+$mb = mb_strtoupper($greek_lower, 'UTF-8');
+var_dump(base64_encode($mb));
+
+if ($mb == $greek_upper) {
+	echo "Correctly converted\n";
+} else {
+	echo "Incorreclty converted\n";
+}
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtoupper_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_basic.php.expectf
new file mode 100644
index 000000000..83ccea2f6
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_basic.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strtoupper() : basic functionality ***
+
+-- ASCII String --
+string(36) "QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVo="
+Correctly converted
+
+-- Multibyte String --
+string(64) "zpHOks6TzpTOlc6WzpfOmM6ZzprOm86czp3Ons6fzqDOoc6jzqTOpc6mzqfOqM6p"
+Correctly converted
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php
new file mode 100644
index 000000000..202873343
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php
@@ -0,0 +1,25 @@
+<?php
+/* Prototype  : string mb_strtoupper(string $sourcestring [, string $encoding]
+ * Description: Returns a uppercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass an incorrect number of arguments to mb_strtoupper() to test behaviour
+ */
+
+echo "*** Testing mb_strtoupper() : error conditions ***\n";
+
+//Test mb_strtoupper with one more than the expected number of arguments
+echo "\n-- Testing mb_strtoupper() function with more than expected no. of arguments --\n";
+$sourcestring = 'string_value';
+$encoding = 'UTF-8';
+$extra_arg = 10;
+var_dump( mb_strtoupper($sourcestring, $encoding, $extra_arg) );
+
+//Test mb_strtoupper with zero arguments
+echo "\n-- Testing mb_strtoupper() function with zero arguments --\n";
+var_dump( mb_strtoupper() );
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php.expectf
new file mode 100644
index 000000000..3775534e8
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strtoupper() : error conditions ***
+
+-- Testing mb_strtoupper() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+
+-- Testing mb_strtoupper() function with zero arguments --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation3.php b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation3.php
new file mode 100644
index 000000000..e93f5a98e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation3.php
@@ -0,0 +1,38 @@
+<?php
+/* Prototype  : string mb_strtoupper(string $sourcestring [, string $encoding]
+ * Description: Returns a uppercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass a Japanese string and a mixed Japanese and ASCII string to mb_strtolower
+ * to check correct conversion is occuring (Japanese characters should not be converted).
+ */
+
+echo "*** Testing mb_strtoupper() : usage variations ***\n";
+
+$string_mixed_upper = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCUEhQLiAwMTIzNO+8le+8lu+8l++8mO+8meOAgg==');
+$string_mixed_lower = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCcGhwLiAwMTIzNO+8le+8lu+8l++8mO+8meOAgg==');
+$string_all_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC');
+
+
+echo "\n-- Mixed string (mulitbyte and ASCII characters) --\n";
+$a = mb_strtoupper($string_mixed_lower, 'UTF-8');
+var_dump(base64_encode($a));
+if ($a == $string_mixed_upper) {
+	echo "Correctly Converted\n";
+} else {
+	echo "Incorrectly Converted\n";
+}
+
+echo "\n-- Multibyte Only String--\n";
+$b = mb_strtoupper($string_all_mb, 'UTF-8');
+var_dump(base64_encode($b));
+if ($b == $string_all_mb) { // Japanese characters only - should not be any conversion
+	echo "Correctly Converted\n";
+} else {
+	echo "Incorrectly Converted\n";
+}
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation3.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation3.php.expectf
new file mode 100644
index 000000000..9e68ec359
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation3.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_strtoupper() : usage variations ***
+
+-- Mixed string (mulitbyte and ASCII characters) --
+string(80) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCUEhQLiAwMTIzNO+8le+8lu+8l++8mO+8meOAgg=="
+Correctly Converted
+
+-- Multibyte Only String--
+string(40) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC"
+Correctly Converted
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation4.php b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation4.php
new file mode 100644
index 000000000..eebfbd5ab
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation4.php
@@ -0,0 +1,33 @@
+<?php
+/* Prototype  : string mb_strtoupper(string $sourcestring [, string $encoding]
+ * Description: Returns a uppercased version of $sourcestring
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass characters from different languages to check that mb_strtoupper is
+ * doing a correct case conversion
+ */
+
+echo "*** Testing mb_strtoupper() : usage variations ***\n";
+
+$uppers = array('Basic Latin' => b'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 
+                'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='),
+                'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw=='));
+$lowers = array('Basic Latin' => b'abcdefghijklmnopqrstuvwxyz',
+                'Characters With Accents' => base64_decode('w6DDocOiw6PDpMOlw6bDp8Oow6nDqsOrw6zDrcOuw6/DsMOxw7LDs8O0w7XDtg=='),
+                'Russian' => base64_decode('0LDQsdCy0LPQtNC10LbQtw=='));
+
+foreach ($lowers as $lang => $sourcestring) {
+	echo "\n-- $lang --\n";
+	$a = mb_strtoupper($sourcestring, 'UTF-8');
+	var_dump(base64_encode($a));
+	if ($a == $uppers[$lang]) {
+		echo "Correctly Converted\n";
+	} else {
+		echo "Incorrectly Converted\n";
+	}
+}
+
+echo "Done";
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation4.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation4.php.expectf
new file mode 100644
index 000000000..f7d393379
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_variation4.php.expectf
@@ -0,0 +1,14 @@
+*** Testing mb_strtoupper() : usage variations ***
+
+-- Basic Latin --
+string(36) "QUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVo="
+Correctly Converted
+
+-- Characters With Accents --
+string(64) "w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=="
+Correctly Converted
+
+-- Russian --
+string(24) "0JDQkdCS0JPQlNCV0JbQlw=="
+Correctly Converted
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strwidth.php b/hphp/test/zend/good/ext-mbstring/mb_strwidth.php
new file mode 100644
index 000000000..15c17094f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strwidth.php
@@ -0,0 +1,24 @@
+<?php
+// TODO: Add more encoding, strings.....
+//$debug = true;
+ini_set('include_path', dirname(__FILE__));
+include_once('common.inc');
+
+// EUC-JP
+$euc_jp = '0123この文字列は日本語です。EUC-JPを使っています。日本語は面倒臭い。';
+
+print  "1: ". mb_strwidth($euc_jp, 'EUC-JP') . "\n";
+/*
+
+print  "2: ". mb_strwidth($euc_jp, 'EUC-JP') . "\n";
+print  "3: ". mb_strwidth($euc_jp, 'EUC-JP') . "\n";
+// Note: Did not start form -22 offset. Staring from 0.
+print  "4: ". mb_strwidth($euc_jp, 'EUC-JP') . "\n";
+
+$str = mb_strwidth($euc_jp, 100, -10,'...','EUC-JP');
+($str === "") ? print "5 OK\n" : print "NG: $str\n";
+
+$str = mb_strwidth($euc_jp, -100, 10,'...','EUC-JP');
+($str !== "") ?	print "6 OK: $str\n" : print "NG: $str\n";
+*/
+?>
diff --git a/hphp/test/zend/good/ext-mbstring/mb_strwidth.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strwidth.php.expectf
new file mode 100644
index 000000000..a84f9fd9e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_strwidth.php.expectf
@@ -0,0 +1 @@
+1: 68
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substitute_character.php b/hphp/test/zend/good/ext-mbstring/mb_substitute_character.php
new file mode 100644
index 000000000..3a5778460
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substitute_character.php
@@ -0,0 +1,25 @@
+<?php
+//$debug = true;
+ini_set('include_path', dirname(__FILE__));
+include_once('common.inc');
+
+// Note: It does not return TRUE/FALSE for setting char
+
+var_dump(mb_substitute_character(0x3044));
+var_dump(mb_substitute_character());
+var_dump(bin2hex(mb_convert_encoding("\xe2\x99\xa0\xe3\x81\x82", "CP932", "UTF-8")));
+
+var_dump(mb_substitute_character('long'));
+var_dump(mb_substitute_character());
+var_dump(bin2hex(mb_convert_encoding("\xe2\x99\xa0\xe3\x81\x82", "CP932", "UTF-8")));
+
+var_dump(mb_substitute_character('none'));
+var_dump(mb_substitute_character());
+var_dump(bin2hex(mb_convert_encoding("\xe2\x99\xa0\xe3\x81\x82", "CP932", "UTF-8")));
+
+var_dump(mb_substitute_character('entity'));
+var_dump(mb_substitute_character());
+var_dump(bin2hex(mb_convert_encoding("\xe2\x99\xa0\xe3\x81\x82", "CP932", "UTF-8")));
+
+var_dump(mb_substitute_character('BAD_NAME'));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substitute_character.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substitute_character.php.expectf
new file mode 100644
index 000000000..e05eeb6a2
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substitute_character.php.expectf
@@ -0,0 +1,14 @@
+bool(true)
+int(12356)
+string(8) "82a282a0"
+bool(true)
+string(4) "long"
+string(16) "552b3236363082a0"
+bool(true)
+string(4) "none"
+string(4) "82a0"
+bool(true)
+string(6) "entity"
+string(20) "262378323636303b82a0"
+ERR: Warning
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php
new file mode 100644
index 000000000..75fcdf48f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php
@@ -0,0 +1,22 @@
+<?php
+/* Prototype  : mixed mb_substitute_character([mixed substchar])
+ * Description: Sets the current substitute_character or returns the current substitute_character 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_substitute_character() : basic functionality ***\n";
+
+
+// Initialise all required variables
+var_dump( mb_substitute_character() );
+var_dump( mb_substitute_character(66) );
+var_dump( mb_substitute_character() );
+var_dump( mb_substitute_character(1234) );
+var_dump( mb_substitute_character() );
+var_dump( mb_substitute_character("none") );
+var_dump( mb_substitute_character() );
+var_dump( mb_substitute_character("b") );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php.expectf
new file mode 100644
index 000000000..81a6af3a6
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php.expectf
@@ -0,0 +1,11 @@
+*** Testing mb_substitute_character() : basic functionality ***
+int(63)
+bool(true)
+int(66)
+bool(true)
+int(1234)
+bool(true)
+string(4) "none"
+HipHop Warning: %a
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php
new file mode 100644
index 000000000..4d95e4c64
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php
@@ -0,0 +1,18 @@
+<?php
+/* Prototype  : mixed mb_substitute_character([mixed substchar])
+ * Description: Sets the current substitute_character or returns the current substitute_character 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_substitute_character() : error conditions ***\n";
+
+
+//Test mb_substitute_character with one more than the expected number of arguments
+echo "\n-- Testing mb_substitute_character() function with more than expected no. of arguments --\n";
+$substchar = 1;
+$extra_arg = 10;
+var_dump( mb_substitute_character($substchar, $extra_arg) );
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php.expectf
new file mode 100644
index 000000000..3f99fcf30
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php.expectf
@@ -0,0 +1,6 @@
+*** Testing mb_substitute_character() : error conditions ***
+
+-- Testing mb_substitute_character() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substitute_character_variation2.php b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_variation2.php
new file mode 100644
index 000000000..8e1043863
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_variation2.php
@@ -0,0 +1,24 @@
+<?php
+/* Prototype  : mixed mb_substitute_character([mixed substchar])
+ * Description: Sets the current substitute_character or returns the current substitute_character 
+ * Source code: ext/mbstring/mbstring.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mb_substitute_character() : variation ***\n";
+//japenese utf-8
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI');
+
+//output the default which is ? in ISO-8859-1, x3f
+var_dump(bin2hex(mb_convert_encoding($string_mb, "ISO-8859-1", "UTF-8")));
+
+mb_substitute_character(66);  //'B' in ISO-8859-1, x42
+var_dump(bin2hex(mb_convert_encoding($string_mb, "ISO-8859-1", "UTF-8")));
+mb_substitute_character("none"); //no substitution
+var_dump(bin2hex(mb_convert_encoding($string_mb, "ISO-8859-1", "UTF-8")));
+mb_substitute_character(280); //not valid in ISO-8859-1
+var_dump(bin2hex(mb_convert_encoding($string_mb, "ISO-8859-1", "UTF-8")));
+
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substitute_character_variation2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_variation2.php.expectf
new file mode 100644
index 000000000..34315b64d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_variation2.php.expectf
@@ -0,0 +1,6 @@
+*** Testing mb_substitute_character() : variation ***
+string(14) "3f3f3f3f3f3f3f"
+string(14) "42424242424242"
+string(0) ""
+string(0) ""
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_count_basic.php b/hphp/test/zend/good/ext-mbstring/mb_substr_count_basic.php
new file mode 100644
index 000000000..12c40221b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_count_basic.php
@@ -0,0 +1,28 @@
+<?php
+/* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
+ * Description: Count the number of substring occurrences 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test Basic functionality of mb_substr_count
+ */
+
+echo "*** Testing mb_substr_count() : basic functionality ***\n";
+
+$string_ascii = 'This is an English string. 0123456789.';
+
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+$needle_mb1 = base64_decode('44CC');
+$needle_mb2 = base64_decode('44GT44KT44Gr44Gh44Gv44CB5LiW55WM');
+
+echo "\n-- ASCII String --\n";
+var_dump(mb_substr_count($string_ascii, 'is'));
+var_dump(mb_substr_count($string_ascii, 'hello, world'));
+
+echo "\n-- Multibyte String --\n";
+var_dump(mb_substr_count($string_mb, $needle_mb1));
+var_dump(mb_substr_count($string_mb, $needle_mb2));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_count_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_count_basic.php.expectf
new file mode 100644
index 000000000..8fd81247e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_count_basic.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_substr_count() : basic functionality ***
+
+-- ASCII String --
+int(3)
+int(0)
+
+-- Multibyte String --
+int(2)
+int(0)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php
new file mode 100644
index 000000000..a7c8a4634
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php
@@ -0,0 +1,28 @@
+<?php
+/* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
+ * Description: Count the number of substring occurrences 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass an incorrect number of arguments to mb_substr_count() to test behaviour
+ */
+
+echo "*** Testing mb_substr_count() : error conditions ***\n";
+
+
+//Test mb_substr_count with one more than the expected number of arguments
+echo "\n-- Testing mb_substr_count() function with more than expected no. of arguments --\n";
+$haystack = 'string_val';
+$needle = 'val';
+$encoding = 'utf-8';
+$extra_arg = 10;
+var_dump( mb_substr_count($haystack, $needle, $encoding, $extra_arg) );
+
+// Testing mb_substr_count with one less than the expected number of arguments
+echo "\n-- Testing mb_substr_count() function with less than expected no. of arguments --\n";
+$haystack = 'string_val';
+var_dump( mb_substr_count($haystack) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php.expectf
new file mode 100644
index 000000000..b599f5e79
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_substr_count() : error conditions ***
+
+-- Testing mb_substr_count() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+
+-- Testing mb_substr_count() function with less than expected no. of arguments --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php
new file mode 100644
index 000000000..19d884762
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php
@@ -0,0 +1,21 @@
+<?php
+/* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
+ * Description: Count the number of substring occurrences 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test behaviour of mb_substr_count() function when passed an unknown encoding
+ */
+
+echo "*** Testing mb_substr_count() : error conditions ***\n";
+
+$haystack = 'Hello, World!';
+$needle = 'Hello';
+$encoding = 'unknown-encoding';
+
+echo "\n-- Testing mb_substr_count() function with an unknown encoding --\n";
+var_dump(mb_substr_count($haystack, $needle, $encoding));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php.expectf
new file mode 100644
index 000000000..a40a1799f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php.expectf
@@ -0,0 +1,6 @@
+*** Testing mb_substr_count() : error conditions ***
+
+-- Testing mb_substr_count() function with an unknown encoding --
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_count_variation4.php b/hphp/test/zend/good/ext-mbstring/mb_substr_count_variation4.php
new file mode 100644
index 000000000..df4a083c8
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_count_variation4.php
@@ -0,0 +1,27 @@
+<?php
+/* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
+ * Description: Count the number of substring occurrences 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass mb_substr_count() a $needle that overlaps in $haystack and see whether
+ * it counts only the first occurrence or all other occurrences regardless whether they
+ * were part of previous match
+ */
+
+echo "*** Testing mb_substr_count() : usage variations ***\n";
+
+
+echo "\n-- ASCII String --\n";
+$string_ascii = b'abcabcabc';
+var_dump(mb_substr_count($string_ascii, b'abcabc')); //needle overlaps in haystack
+
+echo "\n-- Multibyte String --\n";
+$string_mb = base64_decode('5pel5pys6Kqe5pel5pys6Kqe5pel5pys6Kqe');
+$needle_mb = base64_decode('5pel5pys6Kqe5pel5pys6Kqe');
+var_dump(mb_substr_count($string_mb, $needle_mb, 'utf-8'));
+
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_count_variation4.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_count_variation4.php.expectf
new file mode 100644
index 000000000..1e8d4c80f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_count_variation4.php.expectf
@@ -0,0 +1,8 @@
+*** Testing mb_substr_count() : usage variations ***
+
+-- ASCII String --
+int(1)
+
+-- Multibyte String --
+int(1)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_error1.php b/hphp/test/zend/good/ext-mbstring/mb_substr_error1.php
new file mode 100644
index 000000000..77b86863b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_error1.php
@@ -0,0 +1,28 @@
+<?php
+/* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
+ * Description: Returns part of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass incorrect number of arguments to mb_substr() to test behaviour
+ */
+
+echo "*** Testing mb_substr() : error conditions ***\n";
+
+//Test mb_substr with one more than the expected number of arguments
+echo "\n-- Testing mb_substr() function with more than expected no. of arguments --\n";
+$str = 'string_val';
+$start = 10;
+$length = 10;
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( mb_substr($str, $start, $length, $encoding, $extra_arg) );
+
+// Testing mb_substr with one less than the expected number of arguments
+echo "\n-- Testing mb_substr() function with less than expected no. of arguments --\n";
+$str = 'string_val';
+var_dump( mb_substr($str) );
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_error1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_error1.php.expectf
new file mode 100644
index 000000000..91000db0d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_error1.php.expectf
@@ -0,0 +1,10 @@
+*** Testing mb_substr() : error conditions ***
+
+-- Testing mb_substr() function with more than expected no. of arguments --
+HipHop Warning: %a
+NULL
+
+-- Testing mb_substr() function with less than expected no. of arguments --
+HipHop Warning: %a
+NULL
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_error2.php b/hphp/test/zend/good/ext-mbstring/mb_substr_error2.php
new file mode 100644
index 000000000..c547e2407
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_error2.php
@@ -0,0 +1,21 @@
+<?php
+/* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
+ * Description: Returns part of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass an unknown encoding to mb_substr() to test behaviour
+ */
+
+echo "*** Testing mb_substr() : error conditions ***\n";
+
+$str = 'Hello, world';
+$start = 1;
+$length = 5;
+$encoding = 'unknown-encoding';
+
+var_dump( mb_substr($str, $start, $length, $encoding));
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_error2.php.expectf
new file mode 100644
index 000000000..ad38e0593
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_error2.php.expectf
@@ -0,0 +1,4 @@
+*** Testing mb_substr() : error conditions ***
+HipHop Warning: %a
+bool(false)
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_variation3.php b/hphp/test/zend/good/ext-mbstring/mb_substr_variation3.php
new file mode 100644
index 000000000..0fda1352b
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_variation3.php
@@ -0,0 +1,98 @@
+<?php
+/* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
+ * Description: Returns part of a string
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Pass all encodings listed on php.net to test that function recognises them.
+ * NB: The strings passed are *NOT* necessarily encoded in the encoding passed to the function.
+ * This test is purely to see whether the function recognises the encoding.
+ */
+
+echo "*** Testing mb_substr() : usage variations ***\n";
+
+$encoding = array('UCS-4',			/*1*/
+                  'UCS-4BE',
+                  'UCS-4LE',
+                  'UCS-2',
+                  'UCS-2BE',		/*5*/
+                  'UCS-2LE',
+                  'UTF-32',
+                  'UTF-32BE',
+                  'UTF-32LE',
+                  'UTF-16',			/*10*/
+                  'UTF-16BE',
+                  'UTF-16LE',
+                  'UTF-7',
+                  'UTF7-IMAP',
+                  'UTF-8',			/*15*/
+                  'ASCII',
+                  'EUC-JP',
+                  'SJIS',
+                  'eucJP-win',
+                  'SJIS-win',		/*20*/
+                  'ISO-2022-JP',
+                  'JIS',
+                  'ISO-8859-1',
+                  'ISO-8859-2',
+                  'ISO-8859-3',		/*25*/
+                  'ISO-8859-4',
+                  'ISO-8859-5',
+                  'ISO-8859-6',
+                  'ISO-8859-7',
+                  'ISO-8859-8',		/*30*/
+                  'ISO-8859-9',
+                  'ISO-8859-10',
+                  'ISO-8859-13',
+                  'ISO-8859-14',
+                  'ISO-8859-15',	/*35*/
+                  'byte2be',
+                  'byte2le',
+                  'byte4be',
+                  'byte4le',
+                  'BASE64',			/*40*/
+                  'HTML-ENTITIES',
+                  '7bit',
+                  '8bit',
+                  'EUC-CN',
+                  'CP936',			/*45*/
+                  'HZ',
+                  'EUC-TW',
+                  'CP950',
+                  'BIG-5',
+                  'EUC-KR',			/*50*/
+                  'UHC',
+                  'ISO-2022-KR',
+                  'Windows-1251',
+                  'Windows-1252',
+                  'CP866',			/*55*/
+                  'KOI8-R');		/*56*/
+
+
+
+$iterator = 1;
+$string_ascii = 'abc def';
+//Japanese string encoded in UTF-8
+$string_mb = base64_decode('44K/44OT44Ol44Os44O844OG44Kj44Oz44Kw44O744Oe44K344O844Oz44O744Kr44Oz44OR44OL44O8');
+
+foreach($encoding as $enc) {
+	echo "\n-- Iteration $iterator: $enc --\n";
+
+	echo "-- ASCII String --\n";
+	if (mb_substr($string_ascii, 1, 5, $enc)) {
+		echo "Encoding $enc recognised\n";
+	} else {
+		echo "Encoding $enc not recognised\n";
+	}
+
+	echo "-- Multibyte String --\n";
+	if (mb_substr($string_mb, 1, 5, $enc)) {
+		echo "Encoding $enc recognised\n";
+	} else {
+		echo "Encoding $enc not recognised\n";
+	}
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_variation3.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_variation3.php.expectf
new file mode 100644
index 000000000..0d8e98452
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_variation3.php.expectf
@@ -0,0 +1,338 @@
+*** Testing mb_substr() : usage variations ***
+
+-- Iteration 1: UCS-4 --
+-- ASCII String --
+Encoding UCS-4 recognised
+-- Multibyte String --
+Encoding UCS-4 recognised
+
+-- Iteration 1: UCS-4BE --
+-- ASCII String --
+Encoding UCS-4BE recognised
+-- Multibyte String --
+Encoding UCS-4BE recognised
+
+-- Iteration 1: UCS-4LE --
+-- ASCII String --
+Encoding UCS-4LE recognised
+-- Multibyte String --
+Encoding UCS-4LE recognised
+
+-- Iteration 1: UCS-2 --
+-- ASCII String --
+Encoding UCS-2 recognised
+-- Multibyte String --
+Encoding UCS-2 recognised
+
+-- Iteration 1: UCS-2BE --
+-- ASCII String --
+Encoding UCS-2BE recognised
+-- Multibyte String --
+Encoding UCS-2BE recognised
+
+-- Iteration 1: UCS-2LE --
+-- ASCII String --
+Encoding UCS-2LE recognised
+-- Multibyte String --
+Encoding UCS-2LE recognised
+
+-- Iteration 1: UTF-32 --
+-- ASCII String --
+Encoding UTF-32 recognised
+-- Multibyte String --
+Encoding UTF-32 recognised
+
+-- Iteration 1: UTF-32BE --
+-- ASCII String --
+Encoding UTF-32BE recognised
+-- Multibyte String --
+Encoding UTF-32BE recognised
+
+-- Iteration 1: UTF-32LE --
+-- ASCII String --
+Encoding UTF-32LE recognised
+-- Multibyte String --
+Encoding UTF-32LE recognised
+
+-- Iteration 1: UTF-16 --
+-- ASCII String --
+Encoding UTF-16 recognised
+-- Multibyte String --
+Encoding UTF-16 recognised
+
+-- Iteration 1: UTF-16BE --
+-- ASCII String --
+Encoding UTF-16BE recognised
+-- Multibyte String --
+Encoding UTF-16BE recognised
+
+-- Iteration 1: UTF-16LE --
+-- ASCII String --
+Encoding UTF-16LE recognised
+-- Multibyte String --
+Encoding UTF-16LE recognised
+
+-- Iteration 1: UTF-7 --
+-- ASCII String --
+Encoding UTF-7 recognised
+-- Multibyte String --
+Encoding UTF-7 recognised
+
+-- Iteration 1: UTF7-IMAP --
+-- ASCII String --
+Encoding UTF7-IMAP recognised
+-- Multibyte String --
+Encoding UTF7-IMAP recognised
+
+-- Iteration 1: UTF-8 --
+-- ASCII String --
+Encoding UTF-8 recognised
+-- Multibyte String --
+Encoding UTF-8 recognised
+
+-- Iteration 1: ASCII --
+-- ASCII String --
+Encoding ASCII recognised
+-- Multibyte String --
+Encoding ASCII recognised
+
+-- Iteration 1: EUC-JP --
+-- ASCII String --
+Encoding EUC-JP recognised
+-- Multibyte String --
+Encoding EUC-JP recognised
+
+-- Iteration 1: SJIS --
+-- ASCII String --
+Encoding SJIS recognised
+-- Multibyte String --
+Encoding SJIS recognised
+
+-- Iteration 1: eucJP-win --
+-- ASCII String --
+Encoding eucJP-win recognised
+-- Multibyte String --
+Encoding eucJP-win recognised
+
+-- Iteration 1: SJIS-win --
+-- ASCII String --
+Encoding SJIS-win recognised
+-- Multibyte String --
+Encoding SJIS-win recognised
+
+-- Iteration 1: ISO-2022-JP --
+-- ASCII String --
+Encoding ISO-2022-JP recognised
+-- Multibyte String --
+Encoding ISO-2022-JP recognised
+
+-- Iteration 1: JIS --
+-- ASCII String --
+Encoding JIS recognised
+-- Multibyte String --
+Encoding JIS recognised
+
+-- Iteration 1: ISO-8859-1 --
+-- ASCII String --
+Encoding ISO-8859-1 recognised
+-- Multibyte String --
+Encoding ISO-8859-1 recognised
+
+-- Iteration 1: ISO-8859-2 --
+-- ASCII String --
+Encoding ISO-8859-2 recognised
+-- Multibyte String --
+Encoding ISO-8859-2 recognised
+
+-- Iteration 1: ISO-8859-3 --
+-- ASCII String --
+Encoding ISO-8859-3 recognised
+-- Multibyte String --
+Encoding ISO-8859-3 recognised
+
+-- Iteration 1: ISO-8859-4 --
+-- ASCII String --
+Encoding ISO-8859-4 recognised
+-- Multibyte String --
+Encoding ISO-8859-4 recognised
+
+-- Iteration 1: ISO-8859-5 --
+-- ASCII String --
+Encoding ISO-8859-5 recognised
+-- Multibyte String --
+Encoding ISO-8859-5 recognised
+
+-- Iteration 1: ISO-8859-6 --
+-- ASCII String --
+Encoding ISO-8859-6 recognised
+-- Multibyte String --
+Encoding ISO-8859-6 recognised
+
+-- Iteration 1: ISO-8859-7 --
+-- ASCII String --
+Encoding ISO-8859-7 recognised
+-- Multibyte String --
+Encoding ISO-8859-7 recognised
+
+-- Iteration 1: ISO-8859-8 --
+-- ASCII String --
+Encoding ISO-8859-8 recognised
+-- Multibyte String --
+Encoding ISO-8859-8 recognised
+
+-- Iteration 1: ISO-8859-9 --
+-- ASCII String --
+Encoding ISO-8859-9 recognised
+-- Multibyte String --
+Encoding ISO-8859-9 recognised
+
+-- Iteration 1: ISO-8859-10 --
+-- ASCII String --
+Encoding ISO-8859-10 recognised
+-- Multibyte String --
+Encoding ISO-8859-10 recognised
+
+-- Iteration 1: ISO-8859-13 --
+-- ASCII String --
+Encoding ISO-8859-13 recognised
+-- Multibyte String --
+Encoding ISO-8859-13 recognised
+
+-- Iteration 1: ISO-8859-14 --
+-- ASCII String --
+Encoding ISO-8859-14 recognised
+-- Multibyte String --
+Encoding ISO-8859-14 recognised
+
+-- Iteration 1: ISO-8859-15 --
+-- ASCII String --
+Encoding ISO-8859-15 recognised
+-- Multibyte String --
+Encoding ISO-8859-15 recognised
+
+-- Iteration 1: byte2be --
+-- ASCII String --
+Encoding byte2be recognised
+-- Multibyte String --
+Encoding byte2be recognised
+
+-- Iteration 1: byte2le --
+-- ASCII String --
+Encoding byte2le recognised
+-- Multibyte String --
+Encoding byte2le recognised
+
+-- Iteration 1: byte4be --
+-- ASCII String --
+Encoding byte4be recognised
+-- Multibyte String --
+Encoding byte4be recognised
+
+-- Iteration 1: byte4le --
+-- ASCII String --
+Encoding byte4le recognised
+-- Multibyte String --
+Encoding byte4le recognised
+
+-- Iteration 1: BASE64 --
+-- ASCII String --
+Encoding BASE64 recognised
+-- Multibyte String --
+Encoding BASE64 recognised
+
+-- Iteration 1: HTML-ENTITIES --
+-- ASCII String --
+Encoding HTML-ENTITIES recognised
+-- Multibyte String --
+Encoding HTML-ENTITIES recognised
+
+-- Iteration 1: 7bit --
+-- ASCII String --
+Encoding 7bit recognised
+-- Multibyte String --
+Encoding 7bit recognised
+
+-- Iteration 1: 8bit --
+-- ASCII String --
+Encoding 8bit recognised
+-- Multibyte String --
+Encoding 8bit recognised
+
+-- Iteration 1: EUC-CN --
+-- ASCII String --
+Encoding EUC-CN recognised
+-- Multibyte String --
+Encoding EUC-CN recognised
+
+-- Iteration 1: CP936 --
+-- ASCII String --
+Encoding CP936 recognised
+-- Multibyte String --
+Encoding CP936 recognised
+
+-- Iteration 1: HZ --
+-- ASCII String --
+Encoding HZ recognised
+-- Multibyte String --
+Encoding HZ recognised
+
+-- Iteration 1: EUC-TW --
+-- ASCII String --
+Encoding EUC-TW recognised
+-- Multibyte String --
+Encoding EUC-TW recognised
+
+-- Iteration 1: CP950 --
+-- ASCII String --
+Encoding CP950 recognised
+-- Multibyte String --
+Encoding CP950 recognised
+
+-- Iteration 1: BIG-5 --
+-- ASCII String --
+Encoding BIG-5 recognised
+-- Multibyte String --
+Encoding BIG-5 recognised
+
+-- Iteration 1: EUC-KR --
+-- ASCII String --
+Encoding EUC-KR recognised
+-- Multibyte String --
+Encoding EUC-KR recognised
+
+-- Iteration 1: UHC --
+-- ASCII String --
+Encoding UHC recognised
+-- Multibyte String --
+Encoding UHC recognised
+
+-- Iteration 1: ISO-2022-KR --
+-- ASCII String --
+Encoding ISO-2022-KR recognised
+-- Multibyte String --
+Encoding ISO-2022-KR recognised
+
+-- Iteration 1: Windows-1251 --
+-- ASCII String --
+Encoding Windows-1251 recognised
+-- Multibyte String --
+Encoding Windows-1251 recognised
+
+-- Iteration 1: Windows-1252 --
+-- ASCII String --
+Encoding Windows-1252 recognised
+-- Multibyte String --
+Encoding Windows-1252 recognised
+
+-- Iteration 1: CP866 --
+-- ASCII String --
+Encoding CP866 recognised
+-- Multibyte String --
+Encoding CP866 recognised
+
+-- Iteration 1: KOI8-R --
+-- ASCII String --
+Encoding KOI8-R recognised
+-- Multibyte String --
+Encoding KOI8-R recognised
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_variation4.php b/hphp/test/zend/good/ext-mbstring/mb_substr_variation4.php
new file mode 100644
index 000000000..3eefbeb93
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_variation4.php
@@ -0,0 +1,43 @@
+<?php
+/* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
+ * Description: Returns part of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test how mb_substr() behaves when passed a range of integers as $start argument
+ */
+
+echo "*** Testing mb_substr() : usage variations ***\n";
+
+mb_internal_encoding('UTF-8');
+
+$string_ascii = b'+Is an English string'; //21 chars
+
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars
+
+/*
+ * Loop through integers as multiples of ten for $offset argument
+ * 60 is larger than *BYTE* count for $string_mb
+ */
+for ($i = -60; $i <= 60; $i += 10) {
+	if (@$a || @$b) {
+		$a = null;
+		$b = null;
+	}
+	echo "\n**-- Offset is: $i --**\n";
+	echo "-- ASCII String --\n";
+	$a = mb_substr($string_ascii, $i, 4);
+	var_dump(base64_encode($a));
+	echo "--Multibyte String --\n";
+	$b = mb_substr($string_mb, $i, 4, 'UTF-8');
+	if (strlen($a) == mb_strlen($b, 'UTF-8')) { // should return same length
+		var_dump(base64_encode($b));
+	} else {
+		echo "Difference in length of ASCII string and multibyte string\n";
+	}
+	
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_variation4.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_variation4.php.expectf
new file mode 100644
index 000000000..bf79642af
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_variation4.php.expectf
@@ -0,0 +1,80 @@
+*** Testing mb_substr() : usage variations ***
+
+**-- Offset is: -60 --**
+-- ASCII String --
+string(8) "K0lzIA=="
+--Multibyte String --
+string(16) "5pel5pys6Kqe44OG"
+
+**-- Offset is: -50 --**
+-- ASCII String --
+string(8) "K0lzIA=="
+--Multibyte String --
+string(16) "5pel5pys6Kqe44OG"
+
+**-- Offset is: -40 --**
+-- ASCII String --
+string(8) "K0lzIA=="
+--Multibyte String --
+string(16) "5pel5pys6Kqe44OG"
+
+**-- Offset is: -30 --**
+-- ASCII String --
+string(8) "K0lzIA=="
+--Multibyte String --
+string(16) "5pel5pys6Kqe44OG"
+
+**-- Offset is: -20 --**
+-- ASCII String --
+string(8) "SXMgYQ=="
+--Multibyte String --
+string(16) "5pys6Kqe44OG44Kt"
+
+**-- Offset is: -10 --**
+-- ASCII String --
+string(8) "aXNoIA=="
+--Multibyte String --
+string(8) "MTIzNA=="
+
+**-- Offset is: 0 --**
+-- ASCII String --
+string(8) "K0lzIA=="
+--Multibyte String --
+string(16) "5pel5pys6Kqe44OG"
+
+**-- Offset is: 10 --**
+-- ASCII String --
+string(8) "bGlzaA=="
+--Multibyte String --
+string(8) "MDEyMw=="
+
+**-- Offset is: 20 --**
+-- ASCII String --
+string(4) "Zw=="
+--Multibyte String --
+string(4) "44CC"
+
+**-- Offset is: 30 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: 40 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: 50 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: 60 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_variation5.php b/hphp/test/zend/good/ext-mbstring/mb_substr_variation5.php
new file mode 100644
index 000000000..2919735fd
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_variation5.php
@@ -0,0 +1,44 @@
+<?php
+/* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
+ * Description: Returns part of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test how mb_substr() behaves when passed a range of integers as $length argument
+ */
+
+echo "*** Testing mb_substr() : usage variations ***\n";
+
+mb_internal_encoding('UTF-8');
+
+$string_ascii = b'+Is an English string'; //21 chars
+
+//Japanese string, 21 characters
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+/*
+ * Loop through integers as multiples of ten for $offset argument
+ * 60 is larger than *BYTE* count for $string_mb
+ */
+for ($i = -60; $i <= 60; $i += 10) {
+	if (@$a || @$b) {
+		$a = null;
+		$b = null;
+	}
+	echo "\n**-- Offset is: $i --**\n";
+	echo "-- ASCII String --\n";
+	$a = mb_substr($string_ascii, 1, $i);
+	var_dump(base64_encode($a));
+	echo "--Multibyte String --\n";
+	$b = mb_substr($string_mb, 1, $i, 'UTF-8');
+	if (strlen($a) == mb_strlen($b, 'UTF-8')) { // should return same length
+		var_dump(base64_encode($b));
+	} else {
+		echo "Difference in length of ASCII string and multibyte string\n";
+	}
+	
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_variation5.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_variation5.php.expectf
new file mode 100644
index 000000000..bb22e9ced
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_variation5.php.expectf
@@ -0,0 +1,80 @@
+*** Testing mb_substr() : usage variations ***
+
+**-- Offset is: -60 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: -50 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: -40 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: -30 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: -20 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: -10 --**
+-- ASCII String --
+string(16) "SXMgYW4gRW5nbA=="
+--Multibyte String --
+string(40) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMA=="
+
+**-- Offset is: 0 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: 10 --**
+-- ASCII String --
+string(16) "SXMgYW4gRW5nbA=="
+--Multibyte String --
+string(40) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMA=="
+
+**-- Offset is: 20 --**
+-- ASCII String --
+string(28) "SXMgYW4gRW5nbGlzaCBzdHJpbmc="
+--Multibyte String --
+string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+
+**-- Offset is: 30 --**
+-- ASCII String --
+string(28) "SXMgYW4gRW5nbGlzaCBzdHJpbmc="
+--Multibyte String --
+string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+
+**-- Offset is: 40 --**
+-- ASCII String --
+string(28) "SXMgYW4gRW5nbGlzaCBzdHJpbmc="
+--Multibyte String --
+string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+
+**-- Offset is: 50 --**
+-- ASCII String --
+string(28) "SXMgYW4gRW5nbGlzaCBzdHJpbmc="
+--Multibyte String --
+string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+
+**-- Offset is: 60 --**
+-- ASCII String --
+string(28) "SXMgYW4gRW5nbGlzaCBzdHJpbmc="
+--Multibyte String --
+string(68) "5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII="
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_variation6.php b/hphp/test/zend/good/ext-mbstring/mb_substr_variation6.php
new file mode 100644
index 000000000..6f467608d
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_variation6.php
@@ -0,0 +1,48 @@
+<?php
+/* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
+ * Description: Returns part of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test how mb_substr() behaves when passed a range of integers as $start argument
+ */
+
+echo "*** Testing mb_substr() : usage variations ***\n";
+
+mb_internal_encoding('UTF-8');
+
+$string_ascii = b'+Is an English string'; //21 chars
+
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars
+
+/*
+ * Loop through integers as multiples of ten for $offset argument
+ * 60 is larger than *BYTE* count for $string_mb
+ */
+for ($i = -60; $i <= 60; $i += 10) {
+	if (@$a || @$b) {
+		$a = null;
+		$b = null;
+	}
+	echo "\n**-- Offset is: $i --**\n";
+	echo "-- ASCII String --\n";
+	$a = mb_substr($string_ascii, $i, 4);
+	if ($a !== false) {
+	   var_dump(bin2hex($a));
+	}
+	else {
+	   var_dump($a);
+	}		
+	echo "--Multibyte String --\n";
+	$b = mb_substr($string_mb, $i, 4, 'UTF-8');
+	if (strlen($a) == mb_strlen($b, 'UTF-8')) { // should return same length
+		var_dump(bin2hex($b));
+	} else {
+		echo "Difference in length of ASCII string and multibyte string\n";
+	}
+	
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_variation6.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_variation6.php.expectf
new file mode 100644
index 000000000..897970e67
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_variation6.php.expectf
@@ -0,0 +1,80 @@
+*** Testing mb_substr() : usage variations ***
+
+**-- Offset is: -60 --**
+-- ASCII String --
+string(8) "2b497320"
+--Multibyte String --
+string(24) "e697a5e69cace8aa9ee38386"
+
+**-- Offset is: -50 --**
+-- ASCII String --
+string(8) "2b497320"
+--Multibyte String --
+string(24) "e697a5e69cace8aa9ee38386"
+
+**-- Offset is: -40 --**
+-- ASCII String --
+string(8) "2b497320"
+--Multibyte String --
+string(24) "e697a5e69cace8aa9ee38386"
+
+**-- Offset is: -30 --**
+-- ASCII String --
+string(8) "2b497320"
+--Multibyte String --
+string(24) "e697a5e69cace8aa9ee38386"
+
+**-- Offset is: -20 --**
+-- ASCII String --
+string(8) "49732061"
+--Multibyte String --
+string(24) "e69cace8aa9ee38386e382ad"
+
+**-- Offset is: -10 --**
+-- ASCII String --
+string(8) "69736820"
+--Multibyte String --
+string(8) "31323334"
+
+**-- Offset is: 0 --**
+-- ASCII String --
+string(8) "2b497320"
+--Multibyte String --
+string(24) "e697a5e69cace8aa9ee38386"
+
+**-- Offset is: 10 --**
+-- ASCII String --
+string(8) "6c697368"
+--Multibyte String --
+string(8) "30313233"
+
+**-- Offset is: 20 --**
+-- ASCII String --
+string(2) "67"
+--Multibyte String --
+string(6) "e38082"
+
+**-- Offset is: 30 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: 40 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: 50 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: 60 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_variation7.php b/hphp/test/zend/good/ext-mbstring/mb_substr_variation7.php
new file mode 100644
index 000000000..d01ee389e
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_variation7.php
@@ -0,0 +1,49 @@
+<?php
+/* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
+ * Description: Returns part of a string 
+ * Source code: ext/mbstring/mbstring.c
+ */
+
+/*
+ * Test how mb_substr() behaves when passed a range of integers as $length argument
+ */
+
+echo "*** Testing mb_substr() : usage variations ***\n";
+
+mb_internal_encoding('UTF-8');
+
+$string_ascii = b'+Is an English string'; //21 chars
+
+//Japanese string, 21 characters
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+/*
+ * Loop through integers as multiples of ten for $offset argument
+ * 60 is larger than *BYTE* count for $string_mb
+ */
+for ($i = -60; $i <= 60; $i += 10) {
+	if (@$a || @$b) {
+		$a = null;
+		$b = null;
+	}
+	echo "\n**-- Offset is: $i --**\n";
+	echo "-- ASCII String --\n";
+	$a = mb_substr($string_ascii, 1, $i);
+	if ($a !== false) {
+	   var_dump(bin2hex($a));
+	}
+	else {
+	   var_dump($a);
+	}			
+	echo "--Multibyte String --\n";
+	$b = mb_substr($string_mb, 1, $i, 'UTF-8');
+	if (strlen($a) == mb_strlen($b, 'UTF-8')) { // should return same length
+		var_dump(bin2hex($b));
+	} else {
+		echo "Difference in length of ASCII string and multibyte string\n";
+	}
+	
+}
+
+echo "Done";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_variation7.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_variation7.php.expectf
new file mode 100644
index 000000000..d7f83eb6f
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/mb_substr_variation7.php.expectf
@@ -0,0 +1,80 @@
+*** Testing mb_substr() : usage variations ***
+
+**-- Offset is: -60 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: -50 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: -40 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: -30 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: -20 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: -10 --**
+-- ASCII String --
+string(20) "497320616e20456e676c"
+--Multibyte String --
+string(56) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e3808230"
+
+**-- Offset is: 0 --**
+-- ASCII String --
+string(0) ""
+--Multibyte String --
+string(0) ""
+
+**-- Offset is: 10 --**
+-- ASCII String --
+string(20) "497320616e20456e676c"
+--Multibyte String --
+string(56) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e3808230"
+
+**-- Offset is: 20 --**
+-- ASCII String --
+string(40) "497320616e20456e676c69736820737472696e67"
+--Multibyte String --
+string(100) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+
+**-- Offset is: 30 --**
+-- ASCII String --
+string(40) "497320616e20456e676c69736820737472696e67"
+--Multibyte String --
+string(100) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+
+**-- Offset is: 40 --**
+-- ASCII String --
+string(40) "497320616e20456e676c69736820737472696e67"
+--Multibyte String --
+string(100) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+
+**-- Offset is: 50 --**
+-- ASCII String --
+string(40) "497320616e20456e676c69736820737472696e67"
+--Multibyte String --
+string(100) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+
+**-- Offset is: 60 --**
+-- ASCII String --
+string(40) "497320616e20456e676c69736820737472696e67"
+--Multibyte String --
+string(100) "e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082"
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/zend_multibyte-10.php b/hphp/test/zend/good/ext-mbstring/zend_multibyte-10.php
new file mode 100644
index 000000000..201b70464
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/zend_multibyte-10.php
@@ -0,0 +1,5 @@
+<?php
+declare(encoding="ISO-8859-15");
+declare(encoding="ISO-8859-1");
+echo "ok\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/zend_multibyte-10.php.expectf b/hphp/test/zend/good/ext-mbstring/zend_multibyte-10.php.expectf
new file mode 100644
index 000000000..b5754e203
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/zend_multibyte-10.php.expectf
@@ -0,0 +1 @@
+ok
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/zend_multibyte-11.php b/hphp/test/zend/good/ext-mbstring/zend_multibyte-11.php
new file mode 100644
index 000000000..6ed098ef9
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/zend_multibyte-11.php
@@ -0,0 +1,6 @@
+<?php
+declare(encoding="ISO-8859-15") {
+	declare(encoding="ISO-8859-1");
+	echo "ok\n";
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-mbstring/zend_multibyte-11.php.expectf b/hphp/test/zend/good/ext-mbstring/zend_multibyte-11.php.expectf
new file mode 100644
index 000000000..b5754e203
--- /dev/null
+++ b/hphp/test/zend/good/ext-mbstring/zend_multibyte-11.php.expectf
@@ -0,0 +1 @@
+ok
\ No newline at end of file
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 21f4ffe3a..7077ce08b 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -106,7 +106,6 @@ no_import = (
 
     # not imported yet, but will be
     '/ext/gd',
-    '/ext/mbstring',
     '/ext/standard',
     '/ext/mcrypt',
     '/ext/mysql',
@@ -209,6 +208,7 @@ other_files = (
     '/ext-gd/test_gif.gif',
     '/ext-intl/ut_common.inc',
     '/ext-ldap/connect.inc',
+    '/ext-mbstring/common.inc',
     '/ext-openssl/005_crt.txt',
     '/ext-openssl/bug37820cert.pem',
     '/ext-openssl/bug37820key.pem',