Added custom request matcher mock
Fixed factory and added missing tests