Support bool and better tests
Updates