Fixing Unit tests