properly escaped regexp in test case and fixed order declaration issue in FH class