Quick fix for unit tests