Revamps a ton of tests since we now expect back integers instead of strings, as per the spec harness.