Add request parameters and some unit tests