Added tests and tasks