POST parameters now added to end of URL. Refactoring and simplifying tests started, but not finished.