Cleanup
Some more cleanup
More expectations
Continue cleanup
Try to make the hacks less hacky :(
Review the way boolean are parsed
Clean