Fix for obsolete unit tests