Added two sets of AND/OR operators
Added integration functions and tests for them