Added some more conditions to test