improved references and its tests