Fixed issue with unit tests