unified tasks, added testing
unified tasks