[TASK] Another batch of tests