Add one more test for advisor
Use preg_replace_callback instead of deprecated /e modifier

This causes deprecation warning in PHP 5.5
Merge remote-tracking branch 'origin/QA_4_0'