Fix multiple parameter values being squished
Removed unnecessary DB access in some tests