Added unit coverage