Re-enable tests now that #195 is fixed
Use policy ID supplied in params if present. Fixes #226
The policy ID is also used in the form name/id