Fixing for unit tests