TESTING: improved test case
WYIL: removed debugging code.