test case fix - merge changes from commit 55d90cc