Add a few test and changing the EntityRequest to separate classes