slightly modified and enhanced tests