Add tests and changed tasks