Adding coverage
(cherry picked from commit 13d2b49)
adding tests