Explicitly identify static query and form params; update test cases (issue #14)