Update and adding tests