Fixing more unit tests