Fixing few unit tests