Fixing Unit Tests.