fix and or bug
add and or tests