[TASK] Adjust tests and clean a few classes