Add unit & coverage test