Correct the match for apiserver mock
Better error handling
Test the user agents method