Test and fix Boolean and Option default values