[TASK] Clean up unit tests