Fix identation
Write test to confirm case #16
Fix optional params handling, as per #16