Add unit test of the fix