Add more and/or/not spec tests

Some and/or tests failing