More bugs in the Unit Tests.