Checkboxes fixed and tested for nested values

#1 
#2