Update allowing easier GET/POST vars for testing