Fix for Unit Tests