Refactor tests to allow for testing more operations via http