properly escaped regexp in test case and fixed order declaration issue i...

...n FH class