Enable test for #150
Fix #150 now that we have properly impl'd defaulted params
Avoid NPE
Avoid duplicate errors