Test params as well, try to be a bit more abstract, fix another bug.