Checkbox list fixes
Another attempt
More checkboxlist fix
Finishing up
Turning tests back on.