Fix for failing unit tests