Add unit test for fix