Improve mock requests