Fixing Unit tests.