Remove old testing stuff
Move options into request building method