Fix for unit test