API Changed, Add tests