Fixing Unit Tests