Fix Broken Unit Tests