fix tests to work with sf 2.2 and sf 2.3

Now the tests work for 2.2 and 2.3. But the base class of the unit test will is deprecated and will be removed. 

Although there now seems to be another failure in CmfHelper probably not related to that change here.