Added tests for improed code coverage