Fixed a bug with ors (AGAIN)
Minor bug after rename
Added some tests