Fixed the Unit Tests.