Refactor of Asserts/Expects to support Not syntax