Updates fixes based in tests