fixed string and number tests
fixed merge issue