Added some more if tests