Added requests and updated tests