Move tests to correct folder.
Merge branch 'feat_filter_soap_methods_3.x' into feat_3.x_with_fixes