Update and Add tests