Wrote some more test cases and fixed the setup of OR class