Fix for unittest