Adding test coverage

[merge]