Added some tests to increase code coverage