[#0018223] Added unit tests