Added Update and tests