remove unnecessary line breaks
fixed broken test
fixed missing mapping for boolean values