reorg tests
remove handle_bool call here
better handling of boolean masks