Added testing for backward compatibility.