Added some test coverage / Minor adding