Update and extended test