Added some tests to make 100% condition coverage