Changes to unblock obsolete tests