Remove imports for no longer existing functions
Fix the User Agent tests