Support for boolean modifiers
Update tests