Update and add new tests