Fixing parameter parsing for DBAL-496 and #301
Fix test
[DBAL-501] Fix CS
Merge branch 'DBAL-501'