Improved internal test