Added unit facing and the corresponding tests