[#2164] Increasing test coverage