Issue 651 - unit test