[TASK] Cleanup and test coverage increase