Fixed tests, updated tasks.