Added some more test conditions