add orOnRaw and andOnRaw methods and related test case