[TASK] Cleanup Unit Tests