Fixed issue with unit test