[fix] Solving double inheritance issues and adapting tests