Added some tests for some untested corner cases